Steffen van Bergerem
ab9e7d8035
fix hovercards
...
(cherry picked from commit a51c4f0ddc
2014-02-15 16:58:12 +02:00
Florian Staudacher
d8dd727588
fix regression caused by updating backbone.js without updating changed parameters
...
(cherry picked from commit 09a840ea41
2014-02-15 16:54:46 +02:00
arlogn
405b9fd8b9
embedding youtube videos over https
...
(cherry picked from commit 1563d088bc
2014-02-15 16:54:46 +02:00
Fabian Rodriguez
d65fc17223
bump kaminari
...
(cherry picked from commit b5e6c2a149
2014-02-15 16:54:46 +02:00
Steffen van Bergerem
a51c4f0ddc
fix hovercards
2014-02-15 14:09:03 +01:00
Jonne Haß
adf6c3c009
Merge pull request #4775 from dash-rai/move-mentions-input-plugin
...
Moved jquery.mentionsInput plugin
2014-02-10 21:12:12 +01:00
Darshan Rai
1f782dace9
Moved mentionsInput.js from vendor/assets to lib/assets
...
The jquery.mentionsInput plugin upstream is no longer maintained.
2014-02-10 23:19:50 +05:30
Darshan Rai
bc264bfa46
Issue #4767 : Removed space that is inserted following the insertion of a mention
2014-02-10 22:21:35 +05:30
Jonne Haß
3ed4467155
Merge pull request #4765 from goobertron/jquery_source
...
Update JQuery source to jquery.com
Conflicts:
Changelog.md
2014-02-10 17:02:09 +01:00
Jonne Haß
2e8dc8fb61
move PasswordsController specs to the new appropiate location
2014-02-10 10:18:20 +01:00
Jonne Haß
3a616469f4
Merge pull request #4707 from goobertron/improved_new_password
...
New reset password form
Conflicts:
Changelog.md
2014-02-10 01:35:37 +01:00
Jonne Haß
b59bb75b3d
Merge pull request #4772 from svbergerem/image-branding-fix
...
Fix image branding logo_caps
2014-02-09 20:40:33 +01:00
Steffen van Bergerem
29d524d836
fix image branding logo_caps
2014-02-09 20:31:01 +01:00
Jonne Haß
3e3979cc28
Merge pull request #4656 from svbergerem/conversations-add-participants
...
Add participants to conversations menu
2014-02-09 20:20:47 +01:00
Jonne Haß
141438a33e
add changelog entry for #4768 [ci skip]
2014-02-09 20:08:23 +01:00
Jonne Haß
90784b3b38
Merge pull request #4768 from MrZYX/manwithtwowatches-feature/4455-make-help-view-backbone-view
...
Make help pages a backbone view
2014-02-09 20:05:09 +01:00
Steffen van Bergerem
a2b3917505
Add participants to conversations menu
2014-02-09 19:55:10 +01:00
goobertron
23e8bfa082
Update JQuery source to jquery.com
2014-02-09 17:36:35 +00:00
Jonne Haß
11b3fe7df4
Merge pull request #4673 from Flaburgan/drawer-scrollable
...
New menu for the mobile version
2014-02-09 18:06:43 +01:00
flaburgan
119ed2d8f5
Fix nav in header empty with webkit browser
2014-02-09 17:42:29 +01:00
flaburgan
c7c1e874b9
Fix broken header on the settings page on webkit browsers
2014-02-09 17:42:29 +01:00
flaburgan
725fbbf85e
Toggle with jquery + link on the whole line of the menu
2014-02-09 17:42:29 +01:00
flaburgan
70f305958b
Polish the code
2014-02-09 17:42:29 +01:00
flaburgan
4d9d35cbfa
Add current user avatar in the drawer
2014-02-09 17:42:28 +01:00
flaburgan
8c6342170b
Add link on aspects and allow to show / hide them in the drawer
2014-02-09 17:42:28 +01:00
flaburgan
b8bb7ae857
Fix tests
2014-02-09 17:42:28 +01:00
flaburgan
e204a9a121
Add aspects list and mentions link
2014-02-09 17:42:28 +01:00
flaburgan
0a31d61ccc
Make the drawer scrollable
2014-02-09 17:42:28 +01:00
flaburgan
94888f70be
Compose_mobile icon
2014-02-09 17:42:28 +01:00
flaburgan
1a52631bd2
Remove margin of the nav elem
2014-02-09 17:42:28 +01:00
flaburgan
3c5d68dbb4
Fix mobile publisher
2014-02-09 17:42:28 +01:00
flaburgan
c53afe586b
Add new icons to the mobile version
2014-02-09 17:42:28 +01:00
Erwan Guyader
754bd8178d
add drawer to mobile
...
- Functional drawer with menu icon
2014-02-09 17:42:28 +01:00
Erwan Guyader
1e159a027e
Add drawer menu to mobile version
...
- Added basic drawer menu with JS code working on /stream
2014-02-09 17:42:28 +01:00
goobertron
2a145e67ab
Update design of forgot_password and change_password forms
...
Fix redirect to stream, make labels lower-case
Fix cuke
2014-02-09 15:48:06 +00:00
Jonne Haß
c20bc77535
Adjust help views to updated backbone, thanks @raven24
2014-02-09 16:45:21 +01:00
Jonne Haß
4a3869cda8
Merge pull request #4769 from Ruxton/feature/faster_stream_queries
...
Updating queries for the stream to be faster
2014-02-09 16:25:59 +01:00
Jonne Haß
f64f55b567
Move help page initialization into backbone router
2014-02-09 16:00:16 +01:00
Jonne Haß
e402a4093d
Actually load a different section when requested in get_javascript_strings_for, add spec for changes in JS i18n helper
2014-02-09 16:00:16 +01:00
Richard
a132b6c1b5
refactored a bit in help section views. using backbone jquery selector shorthand and jquery each.
2014-02-09 16:00:16 +01:00
Richard
1561690303
moved call to help backbone view init to separate file included only on faq view.
...
extending loaded js locales.
cleaned up unused routes. removed some comments. loading help locales only on help view.
removed afterRender from backbone views. extended load_javascript_locales method to take a section.
2014-02-09 16:00:15 +01:00
Richard
55efa82756
made a help view spec and cleaned up the views a bit.
2014-02-09 16:00:15 +01:00
Richard
da6b037f24
highlighting menu items when clicked. collapsing questions and answers on the static content help sections.
...
removed unused help haml templates.
put locales back to how they were and wrote a small js parser to swap in links to help views which have generated links in them.
using locales text for help section headers.
2014-02-09 16:00:15 +01:00
Richard
afec5977e9
Started converting the help section into a backbone view. Things missing are: some urls which were calculated and inserted into the yml, all the pre-existing erb templates are still there, it's still at /faq/faq, nothing has been tested, some of the questions don't collapse and expand.
...
changed the locales to have the hard coded urls in them because they can no longer be calculated server side. this is pretty crap because i'm going to have to change it for all the languages now so i might change my mind about this later.
deleted some unused views.
2014-02-09 16:00:15 +01:00
Jonne Haß
41a4326993
Merge pull request #4770 from svbergerem/fix-spv-4754
...
Fix bugs introduced by #4754
2014-02-09 15:57:27 +01:00
Steffen van Bergerem
6c7dde1733
Fix bugs introduced by #4754
2014-02-09 15:54:22 +01:00
Jonne Haß
a462c84fae
Merge branch 'goobertron-rename_messages' into develop
2014-02-09 15:45:15 +01:00
goobertron
7bcea07b99
Standardise - code refs to 'messages' to 'conversations'
2014-02-09 15:44:12 +01:00
goobertron
c12efdf5e6
Changing text messages -> conversations
2014-02-09 15:44:10 +01:00
Jonne Haß
17754f1da8
Merge pull request #4747 from Raven24/fix_aspect_stream
...
fix regression caused by updating backbone.js in aspect stream
2014-02-09 15:38:35 +01:00
