goobertron
23e8bfa082
Update JQuery source to jquery.com
2014-02-09 17:36:35 +00: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
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ß
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
goobertron
7bcea07b99
Standardise - code refs to 'messages' to 'conversations'
2014-02-09 15:44:12 +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
Jonne Haß
976b21ab05
Merge pull request #4702 from goobertron/new_logos
...
Updated image branding (issue #4444 )
2014-02-09 14:47:40 +01:00
Jonne Haß
ecd8a8200b
Merge pull request #4754 from svbergerem/small-improvements-spv
...
SPV small improvements
2014-02-09 14:26:41 +01:00
Ruxton
c8a0c81b6a
Updating queries for the stream to be faster
2014-02-07 14:23:19 +08:00
Steffen van Bergerem
97f1c286f4
improve reshared posts
2014-01-31 22:48:40 +01:00
Steffen van Bergerem
318d190404
SPV small improvements
2014-01-30 22:12:51 +01:00
Steffen van Bergerem
655fbfcd79
Fix timeago on mobile devices. Fix missing space
2014-01-30 10:15:14 +01:00
Steffen van Bergerem
fe01734a3d
fix timeago
2014-01-29 03:24:10 +01:00
Raphael Sofaer
300a7c1c31
Merge pull request #4737 from rsofaer/no_retries_for_bad_cert
...
Do not retry sending out posts on SSL errors. See #4728
2014-01-27 20:11:57 -08:00
Raphael Sofaer
de593f6e9f
Do not retry sending out posts on SSL errors. See #4728
...
Refactor HydraWrapper so the when-to-retry logic is in the worker
2014-01-27 15:45:45 -08:00
Dennis Schubert
1f76a9a354
Merge pull request #4739 from MrZYX/stabilize_cukes
...
Stabilize cukes
2014-01-26 14:39:43 -08:00
Florian Staudacher
09a840ea41
fix regression caused by updating backbone.js without updating changed parameters
2014-01-26 19:51:12 +01:00
Steffen van Bergerem
763fb95947
Fix css for keyboard navigation
2014-01-26 04:31:11 +01:00
Jonne Haß
8b8071925d
Make toggle aspect call synchronous and bump capybaras wait timeout
...
in features/desktop/aspect_navigation.feature:18 we quickly leave the page
before waiting for the request to finish. By making the HTTP call
synchronous we wait for it to finish before we reflect the change in the DOM,
thus giving Capybara a chance to wait for it. Also let Capybara wait longer.
This should random failures of the aforementioned cuke rarer.
2014-01-26 00:13:06 +01:00
Jonne Haß
f9c230dd31
Merge pull request #4738 from svbergerem/remove-unused-spv-files
...
Remove unused beta code
2014-01-24 04:19:22 -08:00
Steffen van Bergerem
0f156cd9a4
Remove unused beta code
2014-01-24 09:01:30 +01:00
Steffen van Bergerem
7519fcc255
Remove unused cubbies code
2014-01-24 08:58:47 +01:00
Jonne Haß
0b15e66d06
Merge pull request #4577 from svbergerem/2302-permalink-comments
...
[Ready to review & merge] Add permalinks for comments
Conflicts:
app/assets/stylesheets/application.css.sass
2014-01-22 11:24:42 +01:00
Steffen van Bergerem
3d4bdfb665
Drop number of followers from tags page
2014-01-21 14:49:05 +01:00
Florian Staudacher
5c059b2925
fix regression in conversations causing an infinite recursion ( fix #4715 )
2014-01-20 22:00:26 +01:00
Jonne Haß
9ea6e9c166
Merge pull request #4517 from Zauberstuhl/report_post_feature
...
Added post reporter feature
Conflicts:
Changelog.md
app/assets/stylesheets/application.css.sass
db/schema.rb
2014-01-20 10:03:45 +01:00
Ruxton
a3113cce7c
Switched to using rails-timeago to make keeping on top of new versions of plugin easier
2014-01-20 09:33:35 +08:00
goobertron
19c9c0f394
new version of white2x
2014-01-19 14:53:52 +00:00
goobertron
2fb5098be2
Submitted new images with blurred edges
2014-01-19 14:42:34 +00:00
goobertron
97b5c723af
Updated image branding and files with refs to them
2014-01-18 13:03:59 +00:00
Steffen van Bergerem
20e1626453
add permalinks for comments
2014-01-17 22:11:17 +01:00
Florian Staudacher
1924c40d38
replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem
...
- updates underscore to 1.5.2 and backbone to 1.1.0
backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
models
other changes:
- fix some events triggering multiple times in connection with deleting
a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
* no longer test the backbone router as part of our code
* jasmine factory already returns model instances, no need to wrap
that again
2014-01-16 23:23:30 +01:00
Dennis Schubert
6fc5ccb9f9
Merge pull request #4511 from MrZYX/bump_devise
...
update devise to 3.2
2014-01-15 13:17:48 -08:00
Jonne Haß
d97fd8089b
Merge pull request #4688 from ivanzotov/develop
...
Fix after_create to after_commit
2014-01-15 11:47:23 -08:00
Jonne Haß
15b1dae362
update devise to 3.2
2014-01-15 12:59:59 +01:00
