Benjamin Neff
c06af05e19
Merge pull request #7516 from Flaburgan/back-to-top-position
...
Move back to top to the right to avoid misclicks
2017-08-10 01:26:28 +02:00
Benjamin Neff
3d8bda40e1
Merge pull request #7517 from svbergerem/update-markdown-it
...
Update markdown-it
2017-08-10 01:23:57 +02:00
Steffen van Bergerem
32233ccb99
Merge pull request #7482 from cmrd-senya/markdown-editor-conversations-comments
...
Add markdown editor on conversations and comments
2017-08-09 21:50:35 +02:00
cmrd Senya
621d269760
MD editor coversations&comments: refactorings
...
Javascript refactorings for better maintainability:
* simplePreview function to avoid code duplication
* Preloaded conversation is processed in a slightly different way
* Split isPreviewOrTexareaNotEmpty function since it has more than one responsibility
2017-08-09 21:49:25 +02:00
cmrd Senya
8f4498506d
Fix autosize for the textarea in conversations
...
We need to reinit autosize when we navigate in conversations with the backbone router.
2017-08-09 20:35:23 +03:00
Augier
7b711254a5
Fix CSS and blur on commant submission
2017-08-09 20:35:23 +03:00
Augier
fd39a48bea
Add markdown editor on conversations and comments
2017-08-09 20:35:23 +03:00
Steffen van Bergerem
f2606386d3
Bump markdown-it
2017-08-09 13:36:28 +02:00
flaburgan
62fa43b222
Move back to top to the right to avoid misclicks
2017-08-08 13:01:58 +02:00
Benjamin Neff
f83fb6f4c3
Merge pull request #7484 from Flaburgan/7126-name-invitation-boy
...
Include first/last name in invitation emails body
2017-08-07 23:00:39 +02:00
flaburgan
1eea034844
Add a test
2017-08-07 20:21:51 +02:00
flaburgan
9a27983313
Refactor name condition to a cleaner code, delegate :full_name from profile to person to user
2017-08-07 19:08:17 +02:00
flaburgan
c2e0feb38b
Include first/last name in invitation emails
2017-08-07 19:08:17 +02:00
Benjamin Neff
6ecf784d91
Merge pull request #7513 from SuperTux88/bump-acts-as-taggable-on
...
Bump acts-as-taggable-on
2017-08-04 03:10:12 +02:00
Benjamin Neff
9ca9d63285
Merge pull request #7511 from SuperTux88/sidekiq5
...
Upgrade sidekiq
2017-08-04 03:09:50 +02:00
Benjamin Neff
d0896c7823
Merge pull request #7512 from SuperTux88/well-known
...
Cleanup .gitignore and add note about .well-known to the changelog
2017-08-04 03:08:03 +02:00
Benjamin Neff
3961841506
Bump acts-as-taggable-on
2017-08-04 01:02:11 +02:00
Benjamin Neff
c6a0fbe8d4
Cleanup .gitignore and add note about .well-known to the changelog
...
[ci skip]
2017-08-04 00:54:51 +02:00
Benjamin Neff
31acb5348a
Bump sidekiq
2017-08-03 03:14:30 +02:00
Benjamin Neff
61afb35803
Merge pull request #7510 from SuperTux88/fix-bookmarklet-for-sprockets-3
...
Fix bookmarklet for sprockets 3
2017-08-01 03:33:04 +02:00
Benjamin Neff
1007b3cdbd
Use Rails.application.assets_manifest.assets instead of json file
2017-07-31 22:56:05 +02:00
Benjamin Neff
7f8108e4ac
Precompile bookmarklet to use in production
...
`Rails.application.assets` is only available when `config.assets.compile`
is true (which is false in production). So the old way with a separate
rake task doesn't work in production. But we can get the filename of the
precompiled file from `Rails.application.assets_manifest.assets`.
2017-07-31 22:43:28 +02:00
Benjamin Neff
c42315f3ee
Merge pull request #7507 from SuperTux88/sprockets-3
...
Upgrade sprockets
2017-07-31 21:43:43 +02:00
Benjamin Neff
20822d3333
Merge pull request #7508 from svbergerem/mobile-comment-link
...
Direct links to mobile comments
2017-07-31 03:23:13 +02:00
Steffen van Bergerem
cd0f8a6670
Remove unused data attribute from mobile comments
2017-07-30 12:20:44 +02:00
Steffen van Bergerem
8a3d33d707
Add guid as id attribute to mobile comments
2017-07-30 12:16:47 +02:00
Benjamin Neff
a797f2d27b
Don't precompile all themes for tests
...
And sprockets 3 also caches files in tmp/cache/assets/sprockets
2017-07-30 05:57:19 +02:00
Benjamin Neff
7a26456875
Add checksums to assets in specs
2017-07-30 05:21:33 +02:00
Benjamin Neff
7ee8bfbac4
Precompile poltergeist_disable_transition.css for tests
2017-07-30 05:01:39 +02:00
Benjamin Neff
29a7f151b6
Use config.assets.quiet instead of quiet_assets gem
...
The quiet_assets gem doesn't support rails 5, but sprockets 3 now has a
config.assets.quiet option, which deprecates the quiet_assets gem. But
the logging gem has a no-op silence method, that's why the quiet option
doesn't work out-of-the-box. I added a little hack to use the silence
method from ActiveSupport, which is also used from the original rails
logger.
2017-07-30 04:47:16 +02:00
Benjamin Neff
1360dd4207
Fix require favico.js
...
See rails/sprockets#169
2017-07-30 04:47:16 +02:00
Benjamin Neff
91ec412f14
manifest-*.json is now called .sprockets-manifest-*.json
2017-07-30 04:47:16 +02:00
Benjamin Neff
5f5448f955
Bump sprockets-rails
2017-07-30 02:31:55 +02:00
Benjamin Neff
6b131409f9
Merge pull request #7505 from svbergerem/fix-presenter-spec-filename-typo
...
Fix filename typo for post interaction presenter spec
2017-07-26 13:16:43 +02:00
Steffen van Bergerem
308bb1f77a
Fix filename typo for post interaction presenter spec
2017-07-26 12:01:38 +02:00
Benjamin Neff
e036ffccc9
Merge pull request #7504 from svbergerem/update-jasmine
...
Update jasmine
2017-07-25 22:47:05 +02:00
Benjamin Neff
7416cee0c9
Merge pull request #7477 from diaspora/add-contributing-file
...
Add a Contributing file
2017-07-25 22:43:12 +02:00
Steffen van Bergerem
adf35b4bf0
Bump jasmine
2017-07-25 16:25:44 +02:00
Benjamin Neff
7baa3c0e24
Merge pull request #7495 from codebearsteam/6559-ergonomy-suggestion
...
Issue #6559 : Changed default mail FROM header and tests
fixes #6559
2017-07-25 01:13:32 +02:00
netagonen
ce90d6a020
Replace Diaspora* with pod_name in the FROM header
...
Add pod name to FROM: header for no sender case
2017-07-25 00:49:02 +02:00
Rete2
2be0644281
Issue #6559 : Changed default mail FROM header and tests
2017-07-25 00:46:02 +02:00
Benjamin Neff
da904ac025
Merge pull request #7503 from SuperTux88/quickfix-multi-stream-ignore-users-with-tags
...
Exclude ignored people from followed tags when building stream-relation
2017-07-24 01:35:58 +02:00
Benjamin Neff
a4c26b7464
Exclude ignored people from followed tags when building stream-relation
...
This improves the main stream when you have less or inactive contacts
and ignored an active person that posts many posts with tags. When the
person is only removed after collecting all post ids, you don't see
posts with tags from other people.
2017-07-23 23:33:43 +02:00
Benjamin Neff
35e9faf5f2
Merge pull request #7502 from SuperTux88/cucumber-first-login-timeout
...
Cache assets-cache for cucumber on travis
2017-07-23 19:43:07 +02:00
Benjamin Neff
b0ac09a0a3
Cache assets-cache for cucumber on travis
2017-07-23 18:02:56 +02:00
Benjamin Neff
d8410e21b3
Merge pull request #7259 from Flaburgan/bump-ruby-2.4
...
Bump ruby to 2.4
2017-07-23 18:00:06 +02:00
Benjamin Neff
5d4d7ffa1e
Merge pull request #7501 from SuperTux88/send-public-profile
...
Send public profiles publicly
2017-07-23 04:19:49 +02:00
Benjamin Neff
726e56ffb2
Install gems for production, to see when compatibility breaks
2017-07-23 02:42:01 +02:00
flaburgan
33fa2e8a9e
Bump ruby to 2.4
2017-07-23 02:41:29 +02:00
Benjamin Neff
8942bb98c8
Send and receive public flag for profile
2017-07-23 02:36:29 +02:00
