augier
|
63bfcb7c98
|
Using Blueimp image gallery
|
2015-08-27 23:50:20 +02:00 |
|
Jonne Haß
|
2bf6c87964
|
Merge branch 'stable' into develop
|
2015-08-23 22:49:51 +02:00 |
|
theworldbright
|
335b1c32aa
|
Refactor post presenter
|
2015-08-23 22:49:12 +02:00 |
|
Steffen van Bergerem
|
89a3ea6d20
|
Merge branch 'stable' into develop
|
2015-08-23 14:45:33 +02:00 |
|
Jonne Haß
|
a1ca45b201
|
Update NodeInfo to final 1.0 schema
closes #6340
|
2015-08-23 14:45:20 +02:00 |
|
Steffen van Bergerem
|
eddfa7cb5c
|
Merge pull request #6309 from AugierLe42e/left-navbar-polishing
Left and right navbar polishing
|
2015-08-23 11:29:51 +02:00 |
|
augier
|
450bf4f4ba
|
Refactor and minor styling
|
2015-08-23 09:59:12 +02:00 |
|
Steffen van Bergerem
|
40ef382a6e
|
Merge branch 'stable' into develop
|
2015-08-22 01:35:32 +02:00 |
|
Anton Tkachov
|
ef6c8a5448
|
Issue #6180: Update stream faces block if somebody was blocked
closes #6320
|
2015-08-22 01:35:23 +02:00 |
|
Jonne Haß
|
d396d5555f
|
Merge branch 'stable' into develop
|
2015-08-21 14:23:46 +02:00 |
|
Benjamin Neff
|
663835ed3a
|
remove old webfinger/hcard code
closes #6310
|
2015-08-21 14:23:08 +02:00 |
|
Benjamin Neff
|
d28e03f053
|
use discovery from diaspora_federation gem
|
2015-08-21 14:21:43 +02:00 |
|
Benjamin Neff
|
21e5bd8697
|
add save callback for webfinger
|
2015-08-21 14:21:43 +02:00 |
|
Benjamin Neff
|
65b056341c
|
update federation gem
|
2015-08-21 14:21:42 +02:00 |
|
augier
|
281d1a9161
|
Rebasing and fixing tests
|
2015-08-11 18:12:02 +02:00 |
|
Steffen van Bergerem
|
8bc86eb98b
|
Replace jquery.autocomplete with typeahead.js
|
2015-08-10 22:55:05 +02:00 |
|
Jonne Haß
|
25be9ecfd2
|
Merge branch 'stable' into develop
|
2015-08-09 18:35:44 +02:00 |
|
theworldbright
|
d7c92431ae
|
Extract service from comments controller
closes #6307
|
2015-08-09 18:35:11 +02:00 |
|
Jason Robinson
|
cb909c0d70
|
Strip leading/trailing whitespace from pod tags list in social relay well known
Closes #6303
|
2015-08-09 00:33:35 +03:00 |
|
Jonne Haß
|
480384a077
|
Merge branch 'stable' into develop
|
2015-08-06 22:56:30 +02:00 |
|
Steffen van Bergerem
|
dc576fb0d6
|
Check if person is nil in person_image_tag
closes #6286
|
2015-08-06 22:55:41 +02:00 |
|
augier
|
f917757b5b
|
Use entypo icons on mobile posts
|
2015-08-06 15:56:58 +02:00 |
|
Jonne Haß
|
4442616b0d
|
Merge branch 'stable' into develop
|
2015-07-30 12:01:35 +02:00 |
|
Steffen van Bergerem
|
536d1fe0e7
|
Move nsfw-shield to status-message
closes #6270
|
2015-07-30 12:00:48 +02:00 |
|
Steffen van Bergerem
|
e402bbdd3d
|
Merge pull request #6245 from AugierLe42e/fix-nsfw-author
Fix nsfw author
|
2015-07-30 00:28:15 +02:00 |
|
augier
|
9a23c92f8e
|
Show author of NSFW post
|
2015-07-29 21:13:41 +02:00 |
|
Jonne Haß
|
4abc0c5988
|
Merge branch 'stable' into develop
|
2015-07-29 10:06:04 +02:00 |
|
Steffen van Bergerem
|
67653cf465
|
Update backbone.js
closes #6262
|
2015-07-29 10:04:18 +02:00 |
|
Dennis Schubert
|
04135d7b28
|
Merge branch 'stable' into develop
|
2015-07-27 02:05:14 +02:00 |
|
Steffen van Bergerem
|
6fea450777
|
Fix mobile photos index page
closes #6243
|
2015-07-27 01:59:26 +02:00 |
|
Jonne Haß
|
6ee3843449
|
Merge branch 'stable' into develop
|
2015-07-26 13:11:49 +02:00 |
|
theworldbright
|
2a3dde1ae5
|
Refactor PostService and extract its tests
Squashed commits:
[ada0f09] Remove favorites from Posts table
closes #6208
|
2015-07-26 13:10:24 +02:00 |
|
theworldbright
|
d724397168
|
Refactor posts controller
|
2015-07-26 12:58:42 +02:00 |
|
Dennis Schubert
|
e8297f8d6b
|
Merge pull request #6207 from jaywink/social-relay
Implement social relay requirements
|
2015-07-25 23:01:45 +02:00 |
|
Steffen van Bergerem
|
9ca8005b27
|
Fix percentage on mobile polls
|
2015-07-25 04:34:52 +02:00 |
|
Jonne Haß
|
11a8ac614c
|
Merge pull request #6240 from svbergerem/contact-page-update-counts
Update number of contacts on contact page when adding/removing contacts
|
2015-07-24 22:02:39 +02:00 |
|
Steffen van Bergerem
|
04191996a5
|
Add updates for 'only sharing' and 'all contacts'
|
2015-07-24 14:18:43 +02:00 |
|
Jonne Haß
|
d68b3f02bd
|
Expose whether chat is enabled as NodeInfo metadata
related to #6211
|
2015-07-24 04:16:54 +02:00 |
|
Dennis Schubert
|
be8f920c29
|
Merge branch 'stable' into develop
|
2015-07-24 04:05:32 +02:00 |
|
Jonne Haß
|
b7064677ff
|
Collapse StatisticsController into NodeInfoController
|
2015-07-24 03:51:31 +02:00 |
|
Jonne Haß
|
c928d6c117
|
Expose whether chat is enabled as NodeInfo metadata
related to #6211
|
2015-07-24 03:51:31 +02:00 |
|
Jonne Haß
|
487b0d90ca
|
Implement NodeInfo
|
2015-07-24 03:50:02 +02:00 |
|
Steffen van Bergerem
|
4a178e20e5
|
Update number of contacts on contact page when adding/removing contacts
|
2015-07-24 02:38:49 +02:00 |
|
Jonne Haß
|
5a5d595339
|
Merge pull request #6238 from svbergerem/mobile-location-polls
Add location and polls to mobile website
|
2015-07-23 20:02:11 +02:00 |
|
Steffen van Bergerem
|
79dfdfa224
|
Add integration tests for mobile polls and locations
|
2015-07-23 17:30:53 +02:00 |
|
Jonne Haß
|
f4e0785e96
|
Merge branch 'stable' into develop
|
2015-07-23 17:02:55 +02:00 |
|
cmrd Senya
|
e30293b9c1
|
Enable the jasmine testsuite to work across LAN by setting its Host variable to "0.0.0.0" (instead of default 127.0.0.1) so you could test it with a foreign web browser.
closes #6234
|
2015-07-23 17:02:52 +02:00 |
|
Steffen van Bergerem
|
44c370513e
|
Refactor publisher_view.js
|
2015-07-22 17:36:25 +02:00 |
|
Jonne Haß
|
0cbe7ec9a8
|
Merge branch 'stable' into develop
|
2015-07-22 10:05:46 +02:00 |
|
Steffen van Bergerem
|
f8bbe71f54
|
Remove correlations
closes #6223
|
2015-07-22 09:46:52 +02:00 |
|