Benjamin Neff
d410b62323
Merge branch 'next-minor' into develop
2017-09-19 20:28:36 +02:00
Benjamin Neff
c8340f7d28
Merge branch 'master' into next-minor
2017-09-19 20:26:57 +02:00
Benjamin Neff
508e44e01b
Merge branch 'hotfix/0.7.0.1'
2017-09-19 20:24:37 +02:00
Benjamin Neff
13d6c23713
Bump nokogiri for a security release
2017-09-19 20:20:57 +02:00
Benjamin Neff
9f18d5ba82
Merge branch 'next-minor' into develop
2017-09-18 03:25:02 +02:00
Benjamin Neff
655fe2a912
Cleanup invalid polls without status message
...
closes #7614
2017-09-18 03:24:52 +02:00
Benjamin Neff
00296ffda5
Cleanup invalid likes without target
2017-09-18 03:23:01 +02:00
Benjamin Neff
028199a6f3
Remove "string" column from "ppid" table
...
This was added by accident in 4e18f3849dcloses #7598
2017-09-18 03:21:41 +02:00
Benjamin Neff
26a9e50ef9
Merge branch 'next-minor' into develop
2017-09-17 19:36:00 +02:00
Benjamin Neff
4c967903fe
Remove rails_admin_histories table
...
This was a leftover from rails_admin which was removed in #7440 .
closes #7597
2017-09-17 19:35:50 +02:00
Benjamin Neff
1d2394571c
Remove unused scripts
...
They were added a long time ago and they talk about rails 3 ... we have
rails 5 now and scripts in the bin folder, so I think we can remove
them.
closes #7596
2017-09-17 19:34:05 +02:00
Benjamin Neff
84d553555e
Remove unneeded .freeze
...
closes #7595
2017-09-17 19:32:45 +02:00
Benjamin Neff
f7cbb20e11
Fix AppConfig.version_string with frozen strings
2017-09-17 19:29:16 +02:00
Benjamin Neff
9556790480
Fix Person.find_by_substring with frozen strings
2017-09-17 19:29:16 +02:00
Benjamin Neff
723be461cf
Fix Services::Tumblr#tumblr_template with frozen strings
2017-09-17 19:29:16 +02:00
Benjamin Neff
1b30508c19
Fix ConversationsHelper#conversation_class with frozen strings
2017-09-17 19:29:16 +02:00
Benjamin Neff
79c2db65d7
Fix Diaspora::Camo.from_markdown with frozen strings
2017-09-17 19:29:16 +02:00
Benjamin Neff
f2ab09db17
Fix NotificationMailers::Base#log_mail with frozen strings
2017-09-17 19:29:16 +02:00
Benjamin Neff
9505eabcb3
Fix ApplicationHelper#changelog_url with frozen strings
2017-09-17 19:29:16 +02:00
Benjamin Neff
a6b6251b53
Fix PeopleHelper#person_link and #person_image_link with frozen strings
2017-09-17 19:29:16 +02:00
Benjamin Neff
e82690963d
Add # frozen_string_literal: true to all files
2017-09-17 19:29:15 +02:00
Benjamin Neff
44ebc7375a
Remove unused spec-doc.rb
...
closes #7594
2017-09-17 19:27:47 +02:00
Steffen van Bergerem
c9ba7f697b
Merge branch 'next-minor' into develop
2017-09-04 02:49:22 +02:00
Benjamin Neff
45e714776e
Don't truncate ar_internal_metadata after cucumber scenarios
...
This is an internal active record table and shouldn't be touched. When
this is truncated you need to fix it again by running
`bin/rails db:environment:set RAILS_ENV=test`
This is a temporary fix until there is a new version of
database_cleaner.
closes #7606
2017-09-04 02:49:07 +02:00
Benjamin Neff
c1022ef8ad
Merge branch 'next-minor' into develop
2017-09-03 23:53:33 +02:00
Steffen van Bergerem
460178ad34
Fix the screenshot tool
...
closes #7605
2017-09-03 23:53:26 +02:00
Benjamin Neff
94e904464f
Merge branch 'next-minor' into develop
2017-08-31 02:45:22 +02:00
Steffen van Bergerem
ddaa6df0b4
Replace photo_attachments with photo-attachments
...
closes #7601
2017-08-31 02:45:02 +02:00
Steffen van Bergerem
b77ecd482a
Replace aspect_membership_dropdown with aspect-membership-dropdown
2017-08-31 02:44:54 +02:00
Steffen van Bergerem
473cc2518b
Replace comment_box with comment-box
2017-08-31 02:44:53 +02:00
Steffen van Bergerem
7457f254c1
Replace last_author with last-author
2017-08-31 02:44:53 +02:00
Steffen van Bergerem
9fa032e4c9
Replace people_stream with people-stream
2017-08-31 02:44:53 +02:00
Steffen van Bergerem
7729635485
Replace publisher_textarea_wrapper with publisher-textarea-wrapper
2017-08-31 02:44:53 +02:00
Steffen van Bergerem
caeaf23d4b
Replace aspect_dropdown with aspect-dropdown
2017-08-31 02:44:53 +02:00
Steffen van Bergerem
3df4749733
Replace stream_container with stream-container
2017-08-31 02:44:53 +02:00
Steffen van Bergerem
b4e3f84607
Replace main_stream with main-stream
2017-08-31 02:44:47 +02:00
Steffen van Bergerem
f9029dbdaf
Merge branch 'next-minor' into develop
2017-08-29 12:55:17 +02:00
Benjamin Neff
e31c5ff4dc
Handle unauthenticated users for likes/comments of private posts
...
closes #7583
2017-08-29 12:55:03 +02:00
Benjamin Neff
350e24863f
Allow to load likes and reshares without login
2017-08-29 12:35:48 +02:00
Benjamin Neff
295bb15f73
Merge branch 'next-minor' into develop
2017-08-29 02:17:47 +02:00
Steffen van Bergerem
d130697ce2
Use Bootstrap 3 progress-bar for polls
...
closes #7600
2017-08-29 02:17:32 +02:00
Steffen van Bergerem
02d9d350d9
Move person extension for prefills to conversations form view
...
closes #7599
2017-08-29 02:13:57 +02:00
Steffen van Bergerem
48630b3a04
Fix conversation recipient prefill on contacts page
...
Use the already available contacts data for the prefill
2017-08-29 02:13:27 +02:00
Steffen van Bergerem
666ada44f1
Fix conversation recipient prefill on profile page
...
Fixes #7586
Use the already available data about the recipient for the prefill
2017-08-29 02:13:27 +02:00
Steffen van Bergerem
9d2763089d
Replace where...first with find_by
...
Fixes #7539
closes #7593
2017-08-29 02:11:17 +02:00
flaburgan
a358bf7b66
Move the notification to be the first icon on the left
...
closes #7592
2017-08-29 02:09:51 +02:00
Steffen van Bergerem
98cccda6ea
Remove auto detection of languages with highlightjs
...
Fixes #7476
closes #7591
2017-08-29 02:07:57 +02:00
Steffen van Bergerem
2bb7d4e067
Use language- prefix for codeblocks as defined in the CommonMark spec
2017-08-29 02:07:10 +02:00
Benjamin Neff
04035c3eb7
Allow to receive reshares without root
...
closes #7590
2017-08-29 02:06:08 +02:00
Benjamin Neff
163ffdb19b
Allow multiple reshares without root
...
Follow-up for #7578
Fixes #7587
2017-08-29 02:05:43 +02:00
