Benjamin Neff
84c3814b94
fix notification mails for limited posts
2015-04-22 19:59:08 +02:00
Jonne Haß
d959dd725b
Merge pull request #5850 from svbergerem/modal-for-new-aspect
...
Use Bootstrap modal for new aspect form
2015-04-20 22:34:51 +02:00
Jonne Haß
85c376e591
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-19 15:58:41 +02:00
goobertron
a75ec75ec7
Update aspect edits text, reorder posting section
...
First iteration to update Help section
Changes from Fla
2015-04-19 15:57:21 +02:00
Jonne Haß
b3575ab56f
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-14 15:42:33 +02:00
goobertron
a687a8dc01
Update help text for renaming an aspect
2015-04-14 15:40:58 +02:00
Steffen van Bergerem
895d38de21
Refactor available services settings
2015-04-08 18:43:35 +02:00
Steffen van Bergerem
75ef9f47d0
Use Bootstrap modal for new aspect form
2015-04-07 10:45:09 +02:00
Jonne Haß
4b841ef076
Merge pull request #5843 from margori/private_post_subject_content
...
Limited post content excluded from subject of comment email
2015-04-04 00:39:40 +02:00
Marcelo Briones
aa6b590b3c
Limited post content excluded from subject of comment email
2015-04-03 16:37:17 -03:00
Steffen van Bergerem
07a344d051
Disable auto follow back on aspect deletion
2015-04-03 14:10:14 +02:00
Jonne Haß
179654071b
Move default_url_options to application.rb
...
Apparently the subclasses got loaded before the initializers
were run, thus not inheriting the config.
2015-04-01 14:59:07 +02:00
Jonne Haß
0881810f4e
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-01 03:07:30 +02:00
Jonne Haß
9d4e7f3953
Merge pull request #5830 from svbergerem/fix-text-contact-page
...
Contacts page: remove broken title from 'Start a conversation' button
2015-04-01 02:54:18 +02:00
Steffen van Bergerem
fdf3817ee2
Update javascript styleguide
2015-04-01 01:24:11 +02:00
Steffen van Bergerem
7870f3b127
Contacts page: remove broken title from 'Start a conversation' button
2015-04-01 00:47:31 +02:00
Jason Robinson
c0b8f03225
bump to 0.5.0.0-RC
2015-03-30 17:49:15 +03:00
Jonne Haß
e274470d55
Replace default.html with a regular view
...
So we can correctly reference the images
2015-03-28 23:12:07 +01:00
Jonne Haß
331f4ed988
updated 80 locale files [ci skip]
2015-03-27 11:44:44 +01:00
Steffen van Bergerem
9069fd235d
Add 'no contacts in this aspect yet' message
2015-03-27 03:20:42 +01:00
flaburgan
ef977a170f
Replace Make Something text by the diaspora ball logo on registration page
...
Add ball.svg to /graphics
2015-03-26 00:32:41 +01:00
Jonne Haß
42977333c4
fix javascript pluaralization rules
2015-03-23 20:53:52 +01:00
Jonne Haß
d4d68b10cc
update plural rules
2015-03-23 19:27:38 +01:00
Jonne Haß
cb1203d36e
updated 105 locale files [ci skip]
2015-03-23 15:51:27 +01:00
Jonne Haß
241d12d824
Merge pull request #5798 from svbergerem/remove-centered-layout
...
Remove layout 'centered_with_header_with_footer'
2015-03-20 01:51:27 +01:00
Steffen van Bergerem
d9bf4a2fa6
Remove layout 'centered_with_header_with_footer'
2015-03-18 21:59:56 +01:00
Steffen van Bergerem
6d070c818c
Use jshintrb and guard-jshintrb instead of jshint
2015-03-18 10:49:17 +01:00
Jonne Haß
256d7862b9
Merge pull request #5782 from svbergerem/reshared-poll
...
Display reshared poll
2015-03-15 20:45:51 +01:00
Steffen van Bergerem
81cd1753e4
Improve link to original post in reshared polls
2015-03-15 17:07:16 +01:00
Hincu Petru
9589cb2e0f
disable poll voting for reshared post
2015-03-15 16:46:48 +01:00
Sayed
18a1958ef8
fix too long tag name #5737
2015-03-15 16:15:33 +02:00
Steffen van Bergerem
84a5992a42
Refactor css code, remove unused code
2015-03-13 01:41:14 +01:00
Jonne Haß
2c7b7bb0dc
bump open_graph_reader
2015-03-11 21:59:02 +01:00
Steffen van Bergerem
4f4dfc7554
Fix missing assets bug
2015-03-11 19:18:05 +01:00
Jonne Haß
e7b92c15e2
Replace export_photos and export_users by export queue
2015-03-06 00:38:16 +01:00
Marcelo Briones
b154d87070
Exports user photos as zip file
2015-03-03 19:45:57 -03:00
Jonne Haß
dd45b79a98
Drop Youtube oembed HTTPS hack
...
upstream ships it now that way
2015-03-02 02:34:51 +01:00
Jonne Haß
c9729d66d6
Explicitly set log level for production environment
2015-03-02 01:34:50 +01:00
Steffen van Bergerem
e188782a9a
Remove blueprint code
2015-03-02 00:04:57 +01:00
Jonne Haß
fb6d3db7c7
bump autoprefixer-rails
2015-02-28 02:36:14 +01:00
Jonne Haß
a0c22659d5
Monkey patch to prevent dumping limit on boolean fields
2015-02-27 17:00:41 +01:00
Jonne Haß
162303db37
Enable Rails 5 behavior for exceptions in after_commit callbacks
2015-02-27 16:58:39 +01:00
Jonne Haß
3a8302ff7f
serve_static_assets was renamed to serve_static_files
2015-02-27 16:58:38 +01:00
Jonne Haß
e46a77ba19
Merge pull request #5706 from aka001/help_section
...
Update the help section #5698
2015-02-27 15:57:12 +01:00
Jonne Haß
be1ab6c6a3
Merge branch 'collimarco-issue5350' into develop
2015-02-27 15:33:55 +01:00
Akash Agrawall
e85cb7b373
Help_section_update_keyboard_shortcut
2015-02-27 16:36:11 +05:30
Augier
168adae009
Adding help section for chat
2015-02-26 18:06:39 +01:00
Steffen van Bergerem
cdd1155bd2
JSHint: change values for bitwise and notypeof to the thoughtbot defaults [ci skip]
2015-02-22 13:42:02 +01:00
Jonne Haß
a19b91083e
Merge pull request #5643 from aka001/5564_lock_account
...
Lock account #5564
2015-02-19 03:43:38 +01:00
Akash Agrawall
3bb5e78893
Lock account #5564
2015-02-19 05:45:04 +05:30
flaburgan
2b19b4bfc9
Remove #sign-up-text, change placeholder text to lower-case, fix tests
2015-02-19 00:07:41 +01:00
flaburgan
1c231f3171
refactoring of the public pages design
2015-02-18 22:45:46 +01:00
Faldrian
8f3c03edfa
Added dropdown to add/remove people from/to aspects in mobile view
2015-02-15 22:08:15 +01:00
Steffen van Bergerem
c5468f072f
JSHint: Add spyOn as a global variable
2015-02-14 19:44:00 +01:00
Augier
aa62266376
Added routing system to open a section in help
2015-02-14 18:05:40 +01:00
Jonne Haß
f980eba0a3
add a missing translation
2015-02-14 12:43:48 +01:00
Lukas Matt
a475d5fb62
Add the ability to link to remote user profile
...
related to diaspora/jsxc#77
2015-02-13 19:23:26 +01:00
Jonne Haß
dece3cf6b0
Merge pull request #5417 from svbergerem/notifications-fix-timeago
...
Fix timeago for notifications, add 'no notifications yet' message
2015-02-10 12:20:09 +01:00
Steffen van Bergerem
f27b9dbf79
JSHint disable maxlen and quotmark [ci skip]
2015-02-10 00:43:06 +01:00
Steffen van Bergerem
3312f97981
Fix timeago for notifications, add 'no notifications yet' message
2015-02-09 03:56:37 +01:00
Steffen van Bergerem
c9e46a09d8
Add files for houndci, stricter rules for JSHint
2015-02-09 00:03:51 +01:00
Steffen van Bergerem
2ec093a54c
JSHint boss, evil, loopfunc and scripturl
2015-02-08 23:41:33 +01:00
Steffen van Bergerem
ab6732cac1
JSHint eqeqeq
2015-02-08 23:41:32 +01:00
Steffen van Bergerem
5fa6b8253e
JSHint unused and undefined variables
2015-02-08 23:41:32 +01:00
Steffen van Bergerem
a9a480da0a
JSHint semicolon errors
2015-02-08 23:41:31 +01:00
Steffen van Bergerem
6b0a5823e3
Add JSHint javascript linter
2015-02-08 23:41:31 +01:00
Jonne Haß
b991ffe455
Merge pull request #5624 from dimaursu/emoji
...
Add collation and config check
2015-02-08 00:04:46 +01:00
Jonne Haß
604d2b7a39
Merge pull request #5634 from svbergerem/remove-photo-export
...
Remove photo export from settings
2015-02-07 21:10:33 +01:00
Jonne Haß
02071fcf51
updated 95 locale files [ci skip]
2015-02-07 20:33:43 +01:00
Steffen van Bergerem
7e5f5964e9
Remove photo export from settings
2015-02-07 14:59:18 +01:00
Steffen van Bergerem
8b33b9eb18
Merge pull request #5602 from Faldrian/more-shortcuts
...
Add shortcuts for reshare, expand Post and open first link in a post
Conflicts:
config/locales/diaspora/en.yml
2015-02-07 14:41:56 +01:00
Dumitru Ursu
0829e6f394
Add collation and config check
2015-02-06 00:49:07 +02:00
goobertron
42cd2337be
Amend all text strings in en locales to use sentence case
...
Adapt cukes to work with new capitalisation rules
2015-01-31 17:44:57 +00:00
Faldrian
099974ddef
Add shortcuts for reshare, expand Post and open first link in a post
2015-01-28 16:19:18 +01:00
Marco Colli
eccab62e32
Allow user to enable / disable notifications for a post from stream #5350
2015-01-25 18:40:47 +01:00
Faldrian
31c39a59d1
Added post moderation buttons in SPV
2015-01-25 05:11:59 +01:00
Jonne Haß
9eaa92068f
Merge pull request #5464 from SansPseudoFix/statistics_design
...
[Feature] Statistics page
2015-01-24 23:57:40 +01:00
SansPseudoFix
dc44485230
Feature : Statistics design
2015-01-24 22:34:41 +01:00
Jonne Haß
a7d652c7c9
Merge pull request #5530 from dimaursu/emoji
...
Convert MySQL fields to 4 byte unicode
2015-01-21 02:34:53 +01:00
James Kiesel
7bbd9138de
Fix bad email formatting
2015-01-20 16:51:08 +13:00
Dumitru Ursu
dda5f71124
Add warning about encoding change
...
Add warning about MySQL collation
Fix database index length
This allows new databases to be created with utf8mb4, on MySQL. The maximum
column size is 767 bytes. Each character is 4 bytes long -> 767 / 4 = 191
characters for the column.
2015-01-19 02:19:39 +02:00
Dumitru Ursu
b0ef4509a6
Change the adapter encoding to utf8mb4
2015-01-19 02:18:19 +02:00
Marcelo Briones
63eca447d0
Strip EXIF data as user preference
2015-01-18 10:28:28 -03:00
Jason Robinson
5466362cc4
Add missing export_user queue to sidekiq config
2015-01-17 19:17:55 +02:00
Jason Robinson
9282a4ea8f
Refactor mobile javascript to get rid of console errors.
...
Fixes also mobile bookmarklet services.
2015-01-17 15:50:06 +02:00
James Kiesel
1c69dd7752
Add contacts/posts, and GZipping JSON exporter output
2015-01-15 00:20:19 +13:00
Steffen van Bergerem
026773194a
Replace pagedown by markdown-it
2015-01-10 18:56:20 +01:00
Dumitru Ursu
4ba1032f42
Add autoprefixer
2015-01-07 13:02:53 +02:00
Jonne Haß
f20020f06b
Merge pull request #5473 from svbergerem/contacts-backbonejs
...
Port contacts page to backbonejs
2015-01-06 14:38:55 +01:00
Jonne Haß
e94e9add1a
Merge pull request #5452 from Flaburgan/allow-non-hosted-paypal-buttons
...
Add currency setting to paypal donation and allow unhosted button setting
Conflicts:
Changelog.md
2015-01-06 14:32:57 +01:00
Steffen van Bergerem
9de6a26a22
Port contacts page to backbonejs
2015-01-04 17:13:18 +01:00
Marcelo Briones
fe6052865c
Remove limited content from email notifications
2014-12-28 22:15:47 -03:00
Flaburgan
b444cdf1ea
Add currency and allow unhosted button to paypal donation
2014-12-28 19:50:45 +01:00
margori
27a1886834
Changes delete conversation button tooltip to 'hide' or 'delete'
2014-12-19 18:26:43 -03:00
Jonne Haß
3000d86d57
Merge pull request #5475 from svbergerem/tag-page-improve-wording
...
Improve wording for tagged people on tag page
2014-12-17 16:46:09 +01:00
James Kiesel
e174514d69
Add JSON exporter for user profile download
2014-12-16 08:55:35 +13:00
Steffen van Bergerem
a5068259bb
Improve wording for tagged people on tag page
2014-12-15 18:08:53 +01:00
Dennis Schubert
cc0c19b482
Merge pull request #5462 from jhass/open_graph_reader
...
Bye opengraph_parser, hi open_graph_reader
2014-12-09 04:42:20 +01:00
Jonne Haß
6836af89ad
Correctly implement OpenGraph tags
...
Just defining og:site_name indicates that we support the
OpenGraph protocol, but then we didn't set the required
properties.
2014-12-08 02:25:09 +01:00
Jonne Haß
74a6f42501
Bye opengraph_parser, hi open_graph_reader
...
opengraph_parser is basically unmainted, issues are ignored
or deliberately closed without fixing. It pollutes the global
namespace and has no verification of correctness.
The opengraph gem has basically the same issues, not really maintained,
unreleased patches on master since over a year, not really smart either.
So I created my own version and while at it, why not strive try to be
complete and robust, although it's still a work in progress.
This also improves general URL detection by parsing them
from the message after stripping markdown.
An additional dependency was added to support
fetching sites that require cookies to work at all.
For the same reason Faraday's default redirect limit was
bumped.
2014-12-08 02:01:31 +01:00
