Benjamin Neff
2a553940d4
small design fixes for invites
2016-08-13 01:47:27 +02:00
Benjamin Neff
66b7b7e27a
Cleanup legacy invitations from code
...
Fixes #5116
2016-08-13 01:47:27 +02:00
Benjamin Neff
6cf1cd5d76
migration to remove old unused invitation columns from users table
2016-08-13 01:47:27 +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
Steffen van Bergerem
1d58df13e3
Change 'no posts yet' message [ci skip]
2016-08-12 23:39:46 +02:00
Steffen van Bergerem
bf6af404ee
Merge pull request #6551 from AugierLe42e/bootstrap-markdown
...
Adding bootstrap-markdown editor
2016-08-12 23:37:26 +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
Jonne Haß
780c521bd1
Merge pull request #6973 from svbergerem/alert-accessibility
...
Add role='alert' to alerts
2016-08-12 14:10:25 +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
Dennis Schubert
23d8af9e07
Merge pull request #6971 from svbergerem/poltergeist-disable-animations
...
Disable animations in poltergeist
2016-08-11 20:44:03 -04:00
Jonne Haß
47c6b4eff9
Merge branch 'stable' into develop
2016-08-11 21:34:55 +02:00
Jonne Haß
914fbcde0d
Merge branch 'master' into stable
2016-08-11 21:28:41 +02:00
Jonne Haß
0a77f045a3
bump to 0.5.10.2
2016-08-11 20:25:20 +02:00
Steffen van Bergerem
9108182d5d
Fix getting started popovers cuke
2016-08-11 20:24:59 +02:00
Jonne Haß
4f176dc4e3
Update to Rails 4.2.7.1 which fixes CVE-2016-6316 and CVE-2016-6317
2016-08-11 20:23:55 +02:00
Steffen van Bergerem
8a9ce0d6d8
Disable transitions in poltergeist
2016-08-11 19:05:19 +02:00
Jonne Haß
11ecbbe20b
bump coveralls
2016-08-11 17:54:56 +02:00
Jonne Haß
7dd1fa425a
bump sidekiq
2016-08-11 17:52:29 +02:00
Jonne Haß
ce26f4db55
Merge pull request #6968 from jhass/bump_poltergeist
...
Bump poltergeist
2016-08-11 17:49:09 +02:00
Jonne Haß
2fb1d9fa65
stabilize features/mobile/drawer.feature
2016-08-11 17:18:26 +02:00
Jonne Haß
89b497376f
perhaps stabilize features/mobile/reshare.feature:32
2016-08-11 17:18:26 +02:00
Jonne Haß
e97da964f4
add debug output for features/desktop/mentions_from_profile_page.feature:36
2016-08-11 17:18:23 +02:00
Jonne Haß
e1ed2cacbb
perhaps stabilize features/mobile/invitations.feature:8
2016-08-11 16:27:28 +02:00
Jonne Haß
88ecba14d2
perhaps stabilize features/desktop/aspect_navigation.feature:18
2016-08-11 16:03:16 +02:00
Jonne Haß
8d5d2db0bf
stabilize features/mobile/drawer.feature:59
2016-08-11 15:52:31 +02:00
Jonne Haß
20d0a6e29d
bump cucumber-rails
2016-08-11 15:27:23 +02:00
Jonne Haß
5985085cda
bump poltergeist
2016-08-11 15:25:58 +02:00
Jonne Haß
e70ffebc49
Merge pull request #6805 from cmrd-senya/mention-name-fixup
...
Fix up the meaning of the name parameter in mention
2016-08-11 13:28:02 +02:00
Steffen van Bergerem
16953126d9
Merge pull request #6967 from cmrd-senya/patch-1
...
Fix command in changelog
2016-08-11 13:21:05 +02:00
Senya
bc95de72e4
Fix command in changelog [ci skip]
2016-08-11 14:16:16 +03:00
cmrd Senya
d200e92aeb
Fix up the meaning of the name parameter in mentions
...
The desktop frontend now treats the "name" parameter of mention as
a string to display unconditionally. But the Diaspora::Mentionable
renders mentions the different way: "name" is treated as a fallback
string which is rendered only if the person's name is unavailable.
This reflects on the mobile version ATM. This patch makes it behave
the same way as the current desktop version does.
2016-08-11 13:19:48 +03:00
Jonne Haß
7fa299b7ad
Merge pull request #6959 from cmrd-senya/devise-upgrade
...
Upgrade devise to 4.2
2016-08-11 12:08:42 +02:00
cmrd Senya
4ae26e1ded
Upgrade devise to 4.2
2016-08-11 12:25:36 +03: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
Steffen van Bergerem
db7ce50b6f
Fix links in Changelog [ci skip]
2016-08-11 03:08:11 +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
Benjamin Neff
be47c6bcd0
remove redirect hack for devise
...
only expose routes from devise that we actually use
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
Jonne Haß
218de300bd
Merge pull request #6963 from svbergerem/contacts-page-fixes
...
Contacts page fixes
2016-08-11 01:05:24 +02:00
Steffen van Bergerem
11f6ed2b9a
Fix community spotlight styles
2016-08-10 23:13:18 +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
Jonne Haß
0704a8ca90
Merge pull request #6961 from svbergerem/update-markdownit-sanitizer
...
Update markdown-it-sanitizer
2016-08-10 22:13:00 +02:00
