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

7279 commits

Author SHA1 Message Date
Jason Robinson
7d9248b7ac Merge pull request #4854 from Flaburgan/fix-mobile-drawer 
Fix mobile drawer
 2014-04-12 21:46:54 +03:00
Jason Robinson
ee3a9f9be0 Merge pull request #4912 from goobertron/settings 
Reorder items on settings page and improve wording
 2014-04-12 21:37:52 +03:00
flaburgan
86e71cd1b6 fix registration test 2014-04-11 20:25:58 +02:00
flaburgan
438ebc839f Fix scroll in the drawer nav 2014-04-11 19:02:26 +02:00
flaburgan
a9b9420214 Fix header search bar in safari 2014-04-11 19:02:25 +02:00
flaburgan
e4244f01f5 Remove span12, main content now expand smoothly and the drawer become correctly displayed even in big resolution 2014-04-11 19:02:25 +02:00
flaburgan
c25ae02ff2 Remove mobile footer 2014-04-11 19:02:25 +02:00
flaburgan
53b1f9effd Fix search field in the header of the mobile version 2014-04-11 19:02:25 +02:00
Hincu Petru
2311b761e1 Redirect to stream_path if is destkop 2014-04-08 09:34:14 +00:00
goobertron
63abe9055b Reorder items on settings page and improve wording 
Update cukes to be text-independent
Update changelog
 2014-04-08 00:28:25 +01:00
Hincu Petru
57de031f6b I added the validation for blank to poll question and poll answer 2014-04-07 17:17:41 +00:00
Jonne Haß
682a49605e Merge pull request #4910 from hpetru/rewrite-poll-creator 
Rewrite poll creation inputs
 2014-04-06 22:27:01 +02:00
Jannik Streek
095d616198 fixed federation issue due to missing delegation + test + some minor tweaks 
fixed indenting

renamed test
 2014-04-06 20:58:58 +02:00
Hincu Petru
2d3933ccd8 Rewrite poll creation inputs 2014-04-06 15:01:18 +00:00
Jonne Haß
79bc1a7800 Merge pull request #4906 from hpetru/4903-poll-crash-spv 
Fixed 4903 and not render vote form when user is not logged
 2014-04-05 19:17:31 +02:00
goobertron
5556420740 Fix missing translation in #4905. 2014-04-05 17:06:40 +01:00
Hincu Petru
2ae4d41db3 Fixed 4903 and not render vote form when user is not logged 2014-04-05 14:29:07 +00:00
Hincu Petru
f356ae7216 Add poll in post preview 2014-04-04 11:45:33 +00:00
Hincu Petru
6c00db23cd I update design for poll in post stream 2014-04-03 20:57:14 +00:00
Hincu Petru
cee90e737c Make poll to be compatible with bootstrap 2014-04-03 09:03:54 +00:00
Hincu Petru
fed5ea8cda Refactored poll_view.js 2014-04-02 16:19:07 +00:00
Jonne Haß
211963d320 Merge pull request #4889 from hpetru/4874-malformed-url 
Catch error from decodeURI for prevent crash in posts parsing
 2014-04-01 00:49:27 +02:00
Hincu Petru
552310796c Catch error from decodeURI for prevent crash in posts parsing 2014-03-31 20:24:47 +00:00
Jannik Streek
4130592ca5 fixed bookmarklet 2014-03-31 18:30:01 +02:00
Jannik Streek
6f3844b73b fixed language files, added rails cache counter for poll answer, fixed bug with same poll input for form 2014-03-31 18:14:08 +02:00
Jannik Streek
4174b88987 percentage result round + minor language fix 2014-03-31 18:14:08 +02:00
Jannik Streek
2d0abbae23 added jasmine test for poll view 2014-03-31 18:14:07 +02:00
Jannik Streek
a9843ae996 added cucumber tests, updated spec with xml class test 2014-03-31 18:14:07 +02:00
Jannik Streek
8f9736a741 fixed poll js bug 2014-03-31 18:14:07 +02:00
Jannik Streek
7dcf11e629 fixed federation bug due to roxml missing underscore 2014-03-31 18:14:07 +02:00
Jannik Streek
9c24365fde changed poll result + some minor text improvements 2014-03-31 18:14:07 +02:00
Jannik Streek
c484b2cd0c fixed poll icon issue, improved code, poll in bookmarklets now available 2014-03-31 18:14:07 +02:00
Jannik Streek
12fabe2fb9 finalized voting design + some design fixes + improved code 2014-03-31 18:14:07 +02:00
Jannik Streek
e4c68a4edb improved status messages controller code 2014-03-31 18:14:07 +02:00
Jannik Streek
d0a77ce6b3 design for poll participation implemented, saving works as well 2014-03-31 18:14:07 +02:00
Jannik Streek
04199837b3 poll creation done 2014-03-31 18:14:07 +02:00
Jannik Streek
18a43295b7 poll form completed 2014-03-31 18:14:06 +02:00
Jannik Streek
95d98ff2b6 improved code for poll participation 2014-03-31 18:14:06 +02:00
Jannik Streek
c02414c36d fixed wrong indenting and broken messages tab for polls 2014-03-31 18:14:06 +02:00
Jannik Streek
8a4f833d1d added more tests for the poll federation + fixed broken rspec tests 2014-03-31 18:14:06 +02:00
Jannik Streek
5d560609e4 poll_participation_spec no longer fails, added poll_participation factory 2014-03-31 18:14:06 +02:00
Jannik Streek
fe67bdf2e7 added tests for poll federation and impl for the federation itself. Still in progess 2014-03-31 18:14:06 +02:00
Jannik Streek
dfbe17d046 Poll input fields and data model now available 
question field of poll now in db

fixed merge issues
 2014-03-31 18:14:06 +02:00
Jonne Haß
b207077405 Merge pull request #4859 from hpetru/4848-aspect-memberships-in-notification-dropdown 
Fixed jQuery evenets in notifications-badge
 2014-03-31 13:58:11 +02:00
Hincu Petru
b43e56485d Fixed jquery event listener from notifications-badge.js 2014-03-31 09:52:07 +00:00
Jonne Haß
24a3a42e90 Merge pull request #4880 from svbergerem/hovercard-bootstrap-style-fixes 
Improve hovercard style on Bootstrap pages
 2014-03-30 22:34:31 +02:00
Jonne Haß
07aec2a630 Merge branch 'hpetru-4864-ui-bug-when-tag-is-long' into develop 2014-03-30 13:39:32 +02:00
Hincu Petru
699f327762 Long tags are no longer cut off in the post streams 
Fixed in streams
 2014-03-30 13:37:31 +02:00
goobertron
57d796be1d Fix indentation 2014-03-28 15:21:22 +00:00
Steffen van Bergerem
1fc38278bb Improve hovercard style on Bootstrap pages 2014-03-28 14:00:16 +01:00
goobertron
1dfde65556 Alter link behaviour of OG previews 2014-03-26 19:24:06 +00:00
Jonne Haß
ab15bad53f Merge pull request #4858 from hincupetru/4514-clicking-show-more-comments-empties-textarea 
Save textarea value before rendering comments when clicked 'show more....'
 2014-03-24 14:56:45 +01:00
Steffen van Bergerem
cd241ee94d Hovercards! Everywhere! 2014-03-23 01:15:26 +01:00
Steffen van Bergerem
d9857a3a10 Add separator between days, don't display grey zero 2014-03-20 00:23:38 +01:00
Steffen van Bergerem
4fc9c6416e Port notifications to Bootstrap 2014-03-19 18:45:52 +01:00
Steffen van Bergerem
eabdc7390c Port aspect membership dropdown and hovercards 2014-03-19 17:54:22 +01:00
Steffen van Bergerem
f217a5bc11 Add filters to notifications controller 2014-03-19 17:54:22 +01:00
Hincu Petru
1cef3e42ce I save textarea value before rendering comments when clicked 'show more..' 2014-03-19 12:36:04 +00:00
Jonne Haß
835608f06f Merge pull request #4856 from hincupetru/3692-hashtags-inside-markdown-link 
Check if the hashtag is a link in function .hashtagify
 2014-03-16 14:39:20 +01:00
Hincu Petru
694dc7d80b Check if the hashtag is a link in function .hashtagify 2014-03-16 11:59:49 +00:00
Jonne Haß
cfca0e88f1 Revert "Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link" 
This reverts commit 06ab498620, reversing
changes made to 3c4d8d95d3.

Conflicts:
	Changelog.md
 2014-03-15 21:08:54 +01:00
Jonne Haß
f2fedea3db Merge pull request #4853 from hincupetru/4693-notifications-hovercard-avatars-misaligned 
Fixed "hovercard avatars misaligned in notifications drop-down"
 2014-03-15 19:15:08 +01:00
Jonne Haß
06ab498620 Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link 
Solved problem with hashtags inside markdown links
 2014-03-15 19:12:37 +01:00
Jonne Haß
3c4d8d95d3 Merge pull request #4794 from Flaburgan/improve-search-page 
Add handle indication on search page, improve design
 2014-03-15 19:09:42 +01:00
Jonne Haß
d4e046ecbc Merge pull request #4787 from hincupetru/4726-infinite-photo-stream 
Added limit by max_time to photos#index for prevent "infinite photo stream"
 2014-03-15 19:07:48 +01:00
Jonne Haß
8280556a47 Introduce message renderer 
This new class replaces all existing server side message
rendering helpers and is the new global entry point for such
needs. All models with relevant fields now expose an instance
of MessageRenderer for those. MessageRenderer acts as
gateway between the existing processing solutions for markdown,
mentions and tags and provides a very flexible interface for
all output needs. This makes the API to obtain a message
in a certain format clear. As a result of centralizing the
processing a lot of duplication is eliminated. Centralizing
the message processing also makes it clear where to change
its behaviour, add new representations and what options
are already available.
 2014-03-15 17:16:17 +01:00
Hincu Petru
638744b914 Fixed #4693 2014-03-15 15:25:18 +00:00
Hincu Petru
7c4d783d51 Check if the hashtag is a link in function .hashtagify 2014-03-14 15:49:41 +00:00
flaburgan
027650e856 Add handle indication on search page, improve design 2014-03-13 23:01:42 +01:00
Hincu Petru
e0b23b2dc4 Fixed #4726 infinite photo stream 2014-03-12 22:22:24 +00:00
flaburgan
1250973267 Fix publisher broken after jquery upgrade 2014-03-12 18:41:38 +01:00
Jonne Haß
11603f5496 Merge pull request #4843 from svbergerem/4228-hovercards-same-pod 
Show hovercards in the notification drop-down for users on the same pod

Conflicts:
	Changelog.md
 2014-03-11 21:50:33 +01:00
MatrixCrawler
3273028ed2 Fix atom feed for reshares of deleted posts. 
Propose for fix #4638

Added Changelog line

Added Specs for testing if the reshared origin post is deleted and therefore not shown in the atom feed
 2014-03-11 21:27:08 +01:00
Steffen van Bergerem
aefcfc7b30 Show hovercards in the notification drop-down for users on the same pod 2014-03-11 20:44:28 +01:00
Steffen van Bergerem
5d44a70e62 Fix different button sizes in new publisher 2014-03-11 17:32:07 +01:00
Steffen van Bergerem
0241d9c7db use fixture 2014-03-10 17:21:54 +01:00
Steffen van Bergerem
6fc6474e98 Refactor publisher 2014-03-10 15:15:40 +01:00
Steffen van Bergerem
1b85d9d032 Use a button instead of input to submit, use smaller photos 2014-03-10 15:15:40 +01:00
Steffen van Bergerem
0cc3b10b1f port publisher and bookmarklet to bootstrap 2014-03-10 15:15:40 +01:00
Faldrian
da0b305514 atom-feed content changed to html, use better post-title extractor 
Valid atom feed. Also these features are partially included:
- http://activitystrea.ms/specs/atom/1.0/#activity.verb
- http://portablecontacts.net/draft-spec.html#anchor16
 2014-03-09 00:13:32 +01:00
Anton Ilin
88f502236a Fix arguments for hevercardable helper 
We should pass person object to the hovecrardable helper. In the
current case `this` is the status message, not the status
author. So, let's pass `author` instead of `this`.
 2014-03-07 11:20:45 +02:00
flaburgan
2c4dc830fc Fix aspect renaming after a regression caused by jquery upgrade, close #4822 2014-03-06 00:04:48 +01:00
flaburgan
4cc8f1f76c Fix avatar position in mobile notification 2014-03-03 23:21:31 +01:00
flaburgan
67d71e2280 Fix drawer in some mobile browsers. 
Remove the black background on menu badges.
Fix body content on screen width > 768px.
Start split of mobile css in different files in /mobile/
 2014-02-24 23:30:57 +01:00
Florian Staudacher
a2aff720a2 clear locale on each spec run, fix indentation 2014-02-23 17:13:01 +01:00
Florian Staudacher
dc1c156175 try to appease CI 2014-02-23 16:48:48 +01:00
Florian Staudacher
b0502ef07e don't depend on the order of events (focus has two variants in jQuery) 2014-02-23 16:48:48 +01:00
Florian Staudacher
e3b22ed95c fix likes spec 2014-02-23 16:48:47 +01:00
Florian Staudacher
b27edcb2d1 fix search specs 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
f0ae80b82f add browser detection 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
97ede99c0f #toggle was removed 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
4042e50289 Removes client_side_validations 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
1c09b75cc2 remove comment, for the record, it was an arbitrary number picked due to performance reasons 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
9fc70a03a9 remove unused variable 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
8d8d3c649a remove aspect sorting logic 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
d3921f1f2b #live is no longer supported, use on instead 2014-02-23 16:48:46 +01:00
Fabian Rodriguez
cc9c6c780a remove require if jquery-ui-1.8.9.custom.min 2014-02-23 16:48:46 +01:00
Jonne Haß
c3161943f9 Merge pull request #4787 from arlogn/new-wordpress-logo-icon 
New wordpress logo icon

Conflicts:
	app/assets/stylesheets/application.css.sass
 2014-02-23 15:55:19 +01:00
vcuculo
96fc16f9b5 Fixed heart icon height in right sidebar 2014-02-23 15:02:44 +01:00
Jason Robinson
5fe5507128 Add devise_lastseenable for user last seen tracking. 
Adds a timestamp to user model which is touched when user comes back. Statistics active users counts now use these more reliable timestamps. Fixes #4734
 2014-02-22 23:22:46 +02:00
Jason Robinson
ea82a91085 Merge pull request #4799 from JannikStreek/feature/4778-comment_counters 
Added count of comments to statistics
 2014-02-21 21:49:25 +02:00
Jason Robinson
d7748718f7 Merge pull request #4793 from Flaburgan/refactor-right-side-bar 
Refactor right side bar, see you, BRs.
 2014-02-21 20:27:02 +02:00
Jannik Streek
d603ff818c added comment count to statistic to calculate posts/comments ratios 
fixeds tests for comment count in statistics

added changelog entry and default entry
 2014-02-21 12:25:23 +01:00
flaburgan
16309dc832 Remove the limit to 8 pictures in the view 2014-02-21 01:31:12 +01:00
arlogn
d1aaf0acba new wordpress icons 2014-02-20 20:36:08 +01:00
flaburgan
a7c7e4b1e3 Refactor right side bar, see you, BRs. 2014-02-20 13:01:07 +01:00
arlogn
659ee3ca82 align rightbar icon heart 2014-02-18 20:39:13 +01:00
Steffen van Bergerem
a51c4f0ddc fix hovercards 2014-02-15 14:09:03 +01:00
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ß
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
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ß
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
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
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
Lukas Matt
5c9a3aaf3e Added post report feature 
You can report a single post by clicking the correct icon in the controler section

Workflow:
* Report a post as offensive
* Trigger alerts to every pod-admin
* Pod-admin can review it in the admin interface
* Delete the post or mark it as reviewed
 2014-01-14 15:00:55 -05:00
Ivan Zotov
a4ce6e267a Fix after_create to after_commit 2014-01-14 22:35:29 +04:00
Steffen van Bergerem
580068ed7c Remove background from badges in header 2014-01-14 15:00:36 +01:00
goobertron
706b11b14d Now with passing Cucumber tests 2014-01-13 18:14:43 +00:00
goobertron
a1ac848d62 Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting) 2014-01-12 20:02:33 +00:00
Jonne Haß
42f790fa13 Merge pull request #4666 from jaywink/signup-form-error-redirect 
Instead of redirect on signup form validation, render new
 2014-01-11 14:08:18 -08:00
Jonne Haß
7608319787 Merge pull request #4665 from svbergerem/fix-500-conversations 
fix bug in conversations view causing server error
 2014-01-08 23:55:09 -08:00
arlogn
31177e6bdb bookmarklet publisher more usable mobile 2014-01-09 02:33:47 +01:00
Jonne Haß
ca9e2e24ea Merge pull request #4670 from arlogn/bookmarklet-publisher-more-usable 
bookmarklet publisher more usable
 2014-01-07 11:29:50 -08:00
Jason Robinson
35ece9d65f Instead of redirect on signup form validation, render new with submitted data. 2014-01-06 22:12:07 +02:00
Jason Robinson
db71c9c50b Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$ 2014-01-06 22:00:53 +02:00
maruf
c17a474142 Simple captcha for signup page 2014-01-06 22:00:37 +02:00
Jonne Haß
7c9460d5b0 Merge pull request #4667 from Flaburgan/fix-markdown-display 
Fix markdown indication in the publisher when the user upload an image
 2014-01-06 02:22:21 -08:00
arlogn
61bfbc82e0 bookmarklet publisher more usable 2014-01-06 01:07:05 +01:00
Damien Monet
b849d6c641 Fix: remove location when publisher is cleared by user 2014-01-05 11:09:03 +01:00
flaburgan
f758163f2e Fix markdown indication in the publisher when the user upload an image 2014-01-04 15:58:20 +01:00
Steffen van Bergerem
2e50a16567 fix bug in conversations view causing server error 2014-01-04 01:54:45 +01:00
Jonne Haß
2734471feb Merge pull request #4653 from svbergerem/3119-change-more-comments-link 
Change more comments link
 2014-01-02 01:14:33 -08:00
Steffen van Bergerem
55b967caf9 remove participants popover + improve conversations menu 2014-01-01 21:58:56 +01:00
Steffen van Bergerem
ef128575ae Change more comments link 2013-12-30 13:20:58 +01:00
arlogn
ae3b50080c Fix spinner overlapping in webkit search box (#4446) and replace deprecated pseudo class :-moz-placeholder 2013-12-29 17:16:56 +01:00
Jonne Haß
5d83402dc3 Merge pull request #4628 from jaywink/4627-twitter-truncation-problem 
Fix posting to Twitter by correctly catching over limit exception
 2013-12-22 14:14:30 -08:00
Steffen van Bergerem
a96611c259 use bootstrap labels 2013-12-16 00:46:55 +01:00
Steffen van Bergerem
206e3f9422 fix mobile 2013-12-15 23:40:08 +01:00
Jason Robinson
e665ebdab1 Fix posting to Twitter by correctly catching over limit exception (#4627). Also when doing a retry, make smaller cuts to max characters 2013-12-15 22:01:09 +02:00
Steffen van Bergerem
24310fe5a9 change layout 2013-12-15 20:14:55 +01:00
Steffen van Bergerem
5ab777f8cb remove unused code 2013-12-15 18:01:32 +01:00
Steffen van Bergerem
c24cfb432d fix facebox in conversations view 2013-12-15 14:20:47 +01:00
Steffen van Bergerem
c11b744a7f port conversations view to bootstrap 2013-12-15 13:01:24 +01:00
flaburgan
c24d5193e4 Refactor conversations css + fix inconsistent height of conversations list bug 2013-12-15 01:15:44 +01:00
Fabian Rodriguez
c12a45556d fix #2645 
* refactor a bit #weekly_user_stats
  * pass 0 instead of "" to i18n
  * use the first week if none is provided
 2013-12-13 19:32:04 -02:00
flaburgan
6aced29bb6 Add expand the publisher test 2013-12-13 17:55:33 +01:00
flaburgan
923a4f2ab4 Add indication about markdown formatting in the publisher 2013-12-13 16:02:39 +01:00
Jonne Haß
c660c90091 Merge pull request #4612 from diaspora/drop_spv_old_code 
Drop spv old code
 2013-12-11 07:41:51 -08:00
Fabian Rodriguez
80015e7ba8 move everything under post-viewer/ to single-post-viewer/ 2013-12-08 12:36:01 -02:00
Fabian Rodriguez
8cf4e4a7fb remove old templates 2013-12-08 11:39:36 -02:00
Fabian Rodriguez
933c3b01ca remove old styles 2013-12-07 12:03:26 -02:00
Fabian Rodriguez
f3f8d36b9d remove wallpaper-mood template 2013-12-06 20:07:37 -02:00
Fabian Rodriguez
ea58324aa8 remove template picker 2013-12-04 20:08:54 -02:00
Fabian Rodriguez
6c8c4fc99e remove template picker functionality 2013-12-03 20:53:00 -02:00
Jason Robinson
2c83d0e846 Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings. 2013-12-02 22:35:18 +02:00
Jonne Haß
1ce027eb2c Merge pull request #4605 from manwithtwowatches/feature/4509-image-upload-response-errors 
Feature/4509 image upload response errors
 2013-12-02 00:10:25 +01:00
Jonne Haß
d18bbd8405 Merge pull request #4604 from Flaburgan/refactor-mobile-publisher 
Refactor mobile publisher
 2013-12-02 00:07:08 +01:00
Jonne Haß
4b1255fa8d Merge pull request #4592 from Flaburgan/link-show-more-pictures-mobile 
[Ready to review] Fix "more picture" indication (+n) on mobile by adding a link on the indication

Conflicts:
	Changelog.md
 2013-12-02 00:04:37 +01:00
Jonne Haß
8baa06e477 Merge pull request #4590 from diaspora/4432-photo-lightbox-quickfix 
Add lightbox html to unauthenticated header

Conflicts:
	Changelog.md
 2013-12-01 23:58:00 +01:00
Fabian Rodriguez
cfc247db75 remove PostViewerFeedback 2013-12-01 20:55:49 -02:00
Fabian Rodriguez
9be780468d remove PostViewerInteractions 2013-12-01 20:55:49 -02:00
Fabian Rodriguez
bf3ee8d7bb remove PostViewer 2013-12-01 20:55:48 -02:00
Fabian Rodriguez
179cc9e8dd remove PostViewerAuthor 2013-12-01 20:55:48 -02:00
Fabian Rodriguez
0702db137a remove PostViewerNav 2013-12-01 20:55:48 -02:00
Fabian Rodriguez
d7b8cb2997 remove #next_post_path and #previous_post_path from postpresenter 2013-12-01 20:55:48 -02:00
Fabian Rodriguez
92db8cb929 remove #next and #previous from posts_controller 2013-12-01 20:55:48 -02:00
Fabian Rodriguez
6eed63807d remove next and previous functionality from router 2013-12-01 20:55:48 -02:00
flaburgan
748599a9dd Refactor mobile publisher 2013-11-29 12:30:20 +01:00
Richard
dbbead1587 removed double comment 2013-11-28 21:48:41 +11:00
Richard
1b83b6942b Merge branch 'develop' into feature/4509-image-upload-response-errors 2013-11-28 21:46:01 +11:00
Richard
ff07bddd1b using status messages instead of popup and updated specs for publisher view. 2013-11-28 16:08:03 +11:00
Richard
3671f09b1d checking file upload response error and giving an error alert if there is one. 2013-11-28 12:26:30 +11:00
flaburgan
7a50e79cfa Fix aspect dropdown on contacts page 2013-11-27 13:07:31 -08:00
Jonne Haß
05fa086caa replace ugly 'followed by' grammar assumption at tags#show with proper version 2013-11-20 23:47:50 +01:00
Jonne Haß
478159f1cd Merge pull request #4593 from Flaburgan/improve-mobile-design 
Improve notifications and conversations views design on mobile
 2013-11-20 12:05:28 -08:00
Fabian Rodriguez
d8618f8700 Merge pull request #4591 from Flaburgan/avatar-profile-mobile 
Fix avatar display on mobile profile
 2013-11-18 18:17:34 -08:00
flaburgan
e1fb8200dd Move 'mark all as read' button under the title 2013-11-18 18:02:22 -08:00
flaburgan
85eb584e66 Remove useless :page_title indication from people/show 2013-11-16 15:40:03 -08:00
flaburgan
58886a6b30 Improve notifications and conversations views design 2013-11-16 03:06:25 -08:00
flaburgan
a02b0519c9 Fix "more picture" indication (+n) on mobile by adding a link on the indication 2013-11-16 02:06:45 -08:00
flaburgan
76b151eb7d Fix avatar display on mobile profile 2013-11-16 01:57:37 -08:00
Raphael Sofaer
a07d3616a5 Add lightbox html to unauthenticated header 2013-11-15 14:33:46 -08:00
flaburgan
1833edfd67 Add actions to contacts/index.html page 2013-11-12 19:10:00 -08:00
Jonne Haß
859cd83e38 Merge pull request #4583 from Flaburgan/refactor-mobile-header 
Refactor mobile header, close #4579

Conflicts:
	Changelog.md
 2013-11-10 23:55:55 +01:00
flaburgan
0f2773053e refactor mobile header, close #4579 2013-11-09 23:21:32 -08:00
movilla
1fcd675b3e getting started page mobile error 500. Fix #4534 2013-11-09 19:25:32 -02:00
Fabian Rodriguez
146044bd36 Merge pull request #4578 from taratatach/force-comments-sort-order-in-mobile-spv 
force comments sort order in mobile spv
 2013-11-07 18:16:52 -08:00
Erwan Guyader
0afdb134f8 force comments sort order in mobile spv 2013-11-07 17:19:23 -08:00
flaburgan
bee2c63762 Change icon when adding, fix #4568 2013-11-07 12:55:50 -08:00
flaburgan
3df0fdc09b Improve the management of the contacts visibility settings in an aspect 2013-11-07 12:55:35 -08:00
Steffen van Bergerem
d5c3079623 refactor publisher css 2013-11-07 17:12:35 +01:00
flaburgan
47645dd985 Put the stream first in the left menu 2013-11-04 17:46:45 -08:00
Florian Staudacher
1c4ad0986c refactor message creation (conversations) 2013-10-20 22:46:53 +02:00
Florian Staudacher
830747a11e refactor conversations_controller#create 2013-10-10 21:42:46 +02:00
Jonne Haß
eea9467846 refactor twitter service model 2013-09-30 10:13:14 +02:00
Florian Staudacher
260d86d501 refactor ConversationsController, move query builing to User model 2013-09-30 01:44:57 +02:00
Dennis Schubert
6e62a99732 Merge pull request #4542 from Raven24/empty_publishing 
avoid publishing empty posts
 2013-09-25 13:49:52 -07:00
Florian Staudacher
e614562470 avoid publishing empty posts (fixes #4401) 
invalidate empty posts when created by a local user

add changelog entry
 2013-09-24 21:57:22 +02:00
Jonne Haß
5aa13adfb1 Do not fail when environment.sidekiq.retry is set to false, closes #4545 2013-09-24 13:59:07 +02:00
Srihari Sriraman
c379fb351e Removing the conflicting green in colors 
- This was a regression from pull request #4541
- Moved the red color to the section above to separate it from the rgb
  colors that aren't used
 2013-09-23 09:48:45 +05:30
Srihari Sriraman
91d9d5aea5 Removing the comment regarding the source of the lines 
MrZyk pointed out that this information is preserved in git.
 2013-09-22 15:31:27 +05:30
Srihari Sriraman
034361154f Moving colors in variables.scss to colors.scss 
- Fixed the conflicting red color
- Currently using the darker red
 2013-09-22 14:40:56 +05:30
Florian Staudacher
39810e6196 decode URLs before processing them (fixes #4507) 2013-09-21 15:23:30 +02:00
flaburgan
02ef9e08f6 Remove the (now useless) last post link from the user profile. 2013-09-20 17:37:34 -07:00
Jonne Haß
a2b6740fed pluralize admins.user_search.you_currently 2013-09-20 13:21:33 +02:00
Fabian Rodriguez
abc06686ce Merge pull request #4523 from Flaburgan:improve-getting-started 
Conflicts:
	Changelog.md
 2013-09-19 19:37:54 -03:00
Jonne Haß
2296489704 Merge pull request #4532 from Flaburgan/add-help-link 
Add help link
 2013-09-19 14:33:39 -07:00
Jonne Haß
ac13e79225 Merge pull request #4529 from Flaburgan/fix-timeago-color 
Change .timeago color and align notification, fix #4502
 2013-09-19 23:32:32 +02:00
Jonne Haß
e6be888707 Merge pull request #4522 from fubik/transparent_background 
Add a white background to images displayed in the lightbox

Conflicts:
	Changelog.md
 2013-09-19 23:27:57 +02:00
Florian Staudacher
96f80c8cab cleanup jasmine tests 
and added changelog entry for bugfix #4005
 2013-09-19 23:22:49 +02:00
PallaviTS
5caa46cc83 fixing commenting 
Added jamisne tests for comments

Added 2 jasmine tests for fixing commenting

Bugfix: #4005 added changelog entry
 2013-09-19 23:22:48 +02:00
flaburgan
126e7bdc9c Refactor getting_started page, test if facebook is available, fix #4520 2013-09-18 22:06:47 -07:00
flaburgan
0c8adb2070 Add link to the faq in the right panel 2013-09-18 15:53:04 -07:00
flaburgan
fcad95109f Change .timeago color and align notification, fix #4502 2013-09-17 14:50:32 -07:00
Titouan Lorieul
b53c207477 Add a white background to ALL the images in the navigation bar of the lightbox 2013-09-16 18:35:38 +02:00
Titouan Lorieul
1aca1e1e51 Add a white background to the images shown in the navigation bar of the lightbox 2013-09-16 14:18:37 +02:00
Marek Marecki
0b37e9f736 Fix issue #4499: changed :width in .item_count to :min-width 2013-09-14 09:35:15 +02:00
Titouan Lorieul
8bad0673b3 Add a white background to images shown in the lightbox 
Fixes issue #4475
 2013-09-13 09:47:57 +02:00
Titouan Lorieul
26a3f56c22 Disables submit button in sign up form after submission to avoid email already exists error 2013-09-11 20:49:23 +02:00
Jonne Haß
1a8541ff1a Fix another 500 in the mobile site for signed out browsing 2013-09-10 23:41:29 +02:00
Jonne Haß
72e421b38f Merge pull request #4480 from Raven24/publisher_backbone 
Publisher - now with even more Backbone
 2013-09-04 16:52:30 +02:00
Florian Staudacher
b2ff1878e3 move ui feedback into success callback 2013-09-04 14:47:28 +02:00
sjain1107
5223a2d906 Adding ignore user icon 
Adding ignore user icon

Added jquery

Changed profile.js
 2013-09-04 14:47:23 +02:00
Florian Staudacher
306890445e remove obsolete view 2013-09-03 23:18:19 +02:00
Florian Staudacher
41c0880a9d add jasmine specs for uploader, minor changes 2013-09-03 23:18:19 +02:00
Florian Staudacher
bedfacecfd fix jasmine tests 2013-09-03 23:18:18 +02:00
Florian Staudacher
4da696253a implement publisher uploader as backbone view 2013-09-03 23:18:18 +02:00
Florian Staudacher
4090f134f2 port 'getting started' to a backbone view, revert filename changes 2013-09-03 23:18:18 +02:00
Florian Staudacher
9560a8ec61 create actual backbone view for publisher aspect selection 2013-09-03 23:18:18 +02:00
Florian Staudacher
253ab23f5e publisher: extract services into subview 2013-09-03 23:18:18 +02:00
Jonne Haß
5eb5057864 Merge pull request #4351 from netom/3711_fix_stream_render_time 
Batch insert new posts to stream
 2013-09-01 19:36:07 +02:00
Srihari Sriraman
f53aa3e0e5 Highlighting the currently active stream in the leftNavBar 
- This gives the user the sense of what he/she is currently viewing
- The hover/selected are the same right now. Needs to change.
- Need to find a more meaningful place for `markSelected`

Moved markSelected to app.views.Stream

- Removes duplication
- All streams create this view, and this seems to do some setup on
  initializing, which is a good place to markNavSelected

Changing highlight on hover to 'black' instead of the blue

- The blue was a little intruisive
- Also fixes the vertical alignment issue

Changing the background to bluebg on hover
 2013-09-01 19:32:01 +02:00
Jonne Haß
991a505439 Merge pull request #4485 from colindean/rename_bitcoin_wallet_id 
change bitcoin_wallet_id to bitcoin_address
 2013-09-01 19:24:44 +02:00
Jonne Haß
99657947a9 Merge pull request #4487 from arlogn/word-wrap-on-single-post-view 
Prevent overflow of strings too long on single page view
 2013-09-01 19:23:07 +02:00
Fábián Tamás László
18c22a5e4c Batch insert new posts to stream 2013-09-01 10:16:09 +02:00
Colin Dean
a4ce4404ff change bitcoin_wallet_id to bitcoin_address 
It is better to call it an address than a wallet ID, because the latter may
confuse Bitcoin users who conflate the two. They are not the same.

Also adds convenience method to handle the deprecated variable.
 2013-08-31 20:16:23 -04:00
arlogn
1b295a88e5 Prevent overflow of strings too long on single page view 2013-09-01 01:41:37 +02:00
Jonne Haß
0cdfc7cfbd Make I18n systems more robust against missing keys in pluralization data 
Should make situations like #4468 less frequent
 2013-08-30 19:31:48 +02:00
Jonne Haß
9d092c1b2f Merge pull request #4479 from ssrihari/fix-colors-more 
Refactored the colors palette a little more
 2013-08-30 15:23:05 +02:00
Nils Vogels
a3f3bcf6ef Adjusting the description of the 404 message, in order to avoid having 
to specify why users got a 404, and possibly leaking information while doing this

See discussion in #3717 for rationale on not implementing specific HTTP codes
This solves around #3717 and #3728

Adjusting travis breakage
 2013-08-30 14:42:19 +02:00
Srihari Sriraman
5bd5f9198d Refactored the colors palette a little more 
- Introduced text-dark-grey = #666666
- Converted text colors #777777 and #555555 to text-dark-grey
- Removed header-grey in favor of text-grey
- Included colors in a couple of files where it was missing
- Categorized the colors in the palette based on the contexts of usage
 2013-08-30 17:58:39 +05:30