nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14095 commits 4 branches 0 tags 121 MiB
Commit graph

14095 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Florian Staudacher
6c9cce7cda Merge branch '4264-embed-youtube-on-https' of https://github.com/arlogn/diaspora into arlogn-4264-embed-youtube-on-https 2014-02-09 13:05:39 +01:00
Jonne Haß
d27c6a8305 updated 31 locale files [ci skip] 2014-02-09 12:31:00 +01:00
Fabian Rodriguez
b5e6c2a149 bump kaminari 2014-02-02 21:03:51 -02:00
Jonne Haß
d5207d61d4 Merge pull request #4752 from svbergerem/fix-timeago-mobile 
Fix timeago on mobile devices. Fix missing space
 2014-02-02 07:32:27 -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
arlogn
1563d088bc embedding youtube videos over https 2014-01-30 18:01:27 +01:00
Steffen van Bergerem
655fbfcd79 Fix timeago on mobile devices. Fix missing space 2014-01-30 10:15:14 +01:00
Jonne Haß
c9cd5460ac Merge pull request #4749 from svbergerem/fix-timeago-desktop 
fix timeago
 2014-01-29 01:28:56 -08: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
Jonne Haß
c23fa673a4 Merge pull request #4746 from svbergerem/fix-css-keyboard-navigation 
Fix css for keyboard navigation
 2014-01-26 02:56:39 -08:00
Steffen van Bergerem
763fb95947 Fix css for keyboard navigation 2014-01-26 04:31:11 +01:00
Jonne Haß
eeec0eafe5 Don't rely on the hover to work when deleting a comment in a cuke 
Also reuse comment step for comment deletion cuke.
This effectively masks failures of the comment deletion cuke
until we find a real solution.
 2014-01-26 00:14:35 +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ß
e1e69882ad Merge pull request #4740 from Gallaecio/gl 
Updated the Galician (gl) translation and fixed a typo
 2014-01-25 03:43:31 -08:00
Adrián Chaves Fernández (Gallaecio)
672686a72d Fixed typo: ‘[…] your password, If it was […]’ → ‘[…] your password. If it was […]’. 2014-01-25 08:56:55 +01:00
Adrián Chaves Fernández (Gallaecio)
e9b5da1741 Updated the Galician (gl) translation. 2014-01-25 08:55:13 +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
Jonne Haß
9fe17f1ae0 Merge pull request #4736 from svbergerem/remove-cubbies 
Remove unused cubbies code
 2014-01-24 03:10:40 -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
Jonne Haß
397d814f97 Merge pull request #4717 from svbergerem/tags-remove-followers 
Drop number of followers from tags page
 2014-01-21 13:21:22 -08:00
Steffen van Bergerem
3d4bdfb665 Drop number of followers from tags page 2014-01-21 14:49:05 +01:00
Jason Robinson
590778502d Merge branch 'hotfix/0.3.0.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-01-20 23:40:58 +02:00
Jason Robinson
7bfa7292fa bump to 0.3.0.1 2014-01-20 23:40:01 +02:00
Florian Staudacher
0c5c17f5e2 fix regression in conversations causing an infinite recursion (fix #4715) 
(cherry picked from commit 5c059b2925)

Conflicts:
	Changelog.md
 2014-01-20 23:39:19 +02:00
Florian Staudacher
5c059b2925 fix regression in conversations causing an infinite recursion (fix #4715) 2014-01-20 22:00:26 +01:00
Jonne Haß
d87e8cbb3a Merge pull request #4712 from Ruxton/feature/move_timeago_outside_of_assets_group 
Moves rails-timeago into the root of Gemfile, it's used in views + assets
 2014-01-20 08:59:58 -08:00
Ruxton
49800ece87 Moves rails-timeago into the root of Gemfile, it's used in views + assets 2014-01-20 21:25:15 +08: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