Steffen van Bergerem
9108182d5d
Fix getting started popovers cuke
2016-08-11 20:24:59 +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
Steffen van Bergerem
7985f95db5
Update markdown-it-sanitizer
2016-08-10 19:07:27 +02:00
Jonne Haß
049b607b35
Merge pull request #6960 from svbergerem/escape-input-mentions-box
...
Escape HTML in mentions box
2016-08-10 17:55:22 +02:00
Steffen van Bergerem
0a8573e00b
Add cuke for #6953
2016-08-10 17:21:10 +02:00
Steffen van Bergerem
d9746a8461
Escape HTML in mentions box
2016-08-10 17:19:58 +02:00
Benjamin Neff
86e75a02bb
fix privacy settings form submit
2016-08-10 13:16:59 +02:00
Benjamin Neff
37837b3f73
fix style on registration-page after errors
2016-08-10 13:16:59 +02:00
Jonne Haß
edd568007d
Merge pull request #6954 from svbergerem/refactor-osm-in-spv
...
Refactor locations in the SPV
2016-08-10 12:10:17 +02:00
Jonne Haß
90abad0152
Merge pull request #6950 from cmrd-senya/consolidate-queues
...
Consolidate queues
2016-08-10 11:46:09 +02:00
Steffen van Bergerem
a591ae781a
Refactor tileLayer creation
2016-08-10 11:30:48 +02:00
Steffen van Bergerem
3fb7b420eb
Always show expanded map in SPV
2016-08-10 11:30:48 +02:00
cmrd Senya
89b12345bb
Rake task for legacy sidekiq queues
2016-08-10 08:51:22 +00:00
Jason Robinson
78299c9e2f
Consolidate amount of sidekiq queues from 13 to 5
...
Sidekiq documentation says 'Sidekiq is not designed to work well with dozens of queues.'. Having the amount of queues we have at the moment brings no anyway.
Closes #5571
2016-08-10 08:51:22 +00:00
Jonne Haß
c1bd072e76
Merge pull request #6953 from svbergerem/fix-typeahead-mentions
...
Fix typeahead mentions
2016-08-10 01:16:42 +02:00
Steffen van Bergerem
0bc5ec4bb4
Make customsearch filter async results for typeahead.js
2016-08-10 00:41:07 +02:00
Steffen van Bergerem
5865314172
Use typeahead.js version from github
2016-08-10 00:41:07 +02:00
Steffen van Bergerem
f1772a86b3
Configure pronto to ignore files in vendor and consolidate comments
2016-08-10 00:40:48 +02:00
Jonne Haß
8e887f884e
Merge pull request #6951 from svbergerem/contacts-search
...
Modify search to include contacts
2016-08-09 19:51:46 +02:00
