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

3542 commits

Author SHA1 Message Date
Błażej Pankowiak
2424301112 Port Community Spotlight to Bootstrap 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
d0cbde2394 Style aspect controls 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
0ad658f98c Port main Contact page to Bootstrap 2014-08-14 21:09:57 +02:00
Pablo Cuadrado
83b1682750 removed border in tags, checkboxes centered inside the well classes 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
beb795e3b3 elements are centered within the grid 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
a6998c23b7 narrower settings pages 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
39ae80027a profile birthday proportional selects (using responsive classes) 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
1662814333 Narrower content for settings pages (2/3 of available width). 2014-08-14 04:49:50 -03:00
Pablo Cuadrado
c6511c9299 services edit page ported to bootstrap 2014-08-14 04:49:50 -03:00
Pablo Cuadrado
2611747875 privacy settings page ported to bootstrap 2014-08-14 04:49:49 -03:00
Pablo Cuadrado
9e34887712 profile edit page ported to bootstrap 2014-08-14 04:49:49 -03:00
Pablo Cuadrado
855597541a user account edit page fully ported to bootstrap 2014-08-14 04:49:49 -03:00
Błażej Pankowiak
255b8c02a2 Set top margin only on the body element 2014-08-07 00:15:17 +02:00
Jonne Haß
344cb55b06 Merge pull request #5083 from theatre-x/patch-3 
Change end year
 2014-07-30 19:11:05 +02:00
theatre-x
bf479f6715 Change end year 
Changed to 1910. So people like THIS: https://en.wikipedia.org/wiki/Jacque_Fresco#Early_life can actually use Diaspora.
 2014-07-20 20:31:14 -04:00
Steffen van Bergerem
f615ad3115 Port people search to Bootstrap 2014-07-20 18:21:13 +02:00
Jonne Haß
fe1d1bd7a8 Merge pull request #5056 from arlogn/login-podname-size-flexible 
Flexible font-size for huge text in sign_in page
 2014-07-07 09:03:48 +02:00
arlogn
2394c3df39 flexible font-size for sign_in podname huge text 2014-07-06 19:18:21 +02:00
Mikael Nordfeldth
65e7840085 Publish salmon endpoint URL in Webfinger XRD 
Specification in Panzer draft for Salmon, paragraph 3.3 mentions:
   "The 'salmon' link relation may specify a Salmon endpoint used to notify
    a resource, typically a user account, about external mentions of that
    resource. For a user account, the salmon mention link SHOULD appear in
    the Webfinger [Webfinger] XRD document for the user account."

Source:
http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#SMLR
 2014-07-06 15:05:51 +02:00
Dennis Schubert
4a2836b108 Remove stylesheet tag from mobile sign_up template 2014-07-05 00:39:39 +02:00
Błażej Pankowiak
0d0ed4db28 Port Getting Started page to Bootstrap 2014-07-04 18:06:49 +02:00
Jonne Haß
0515c33769 Use double quotes when embeding translations in JS 
Translations commonly include single quotes, which closes
the JavaScript string unexpectedly. Closes #5055
 2014-07-03 22:57:42 +02:00
Florian Staudacher
13b716a449 allow admins to close user accounts from the backend 
* thanks to @maxwell for the initial work on this

port admin pages to bootstrap
* improve user view on admin search page
* add 'close account' link to each user in the search results
* keep the same blue color for the admin menu

some refactoring of the routes and the admin code
* try to be more RESTful (possibly)
* use a 'UserSearch' model for search parameters and querying

add changelog entry
 2014-07-01 23:33:15 +02:00
Maxwell Salzberg
cc53e1762b A podmin can now disable a spam account from the interface. 2014-07-01 17:51:39 +02:00
Jason Robinson
e4e9f40b2c Revert "Fix toggling services for mobile bookmarklet" 
This fixed the toggling of services, but broke the actual
bookmarklet :)

This reverts commit 1bd7989045.
 2014-06-19 21:47:34 +03:00
Jason Robinson
1bd7989045 Fix toggling services for mobile bookmarklet 2014-06-02 23:29:47 +03:00
Jason Robinson
8fead54ab6 Make publisher spinner also work in bootstrap publisher 2014-06-01 14:52:59 +03:00
Jason Robinson
128be9204c Refactor UI hint on status message submit. 
Now we close the publisher on submit and reopen it on error. The spinner is shown while submission is in progress. Fixes #4949
 2014-06-01 14:25:34 +03:00
Jason Robinson
b73e478e26 Add spinner to publisher when posting a message 
Fixes #4949
 2014-05-31 21:05:36 +03:00
Marien Fressinaud
fa2de8c195 Remove duplicate checkbox in Settings 
Fix issue #4964
 2014-05-22 22:39:09 +02:00
Lukas Matt
6d6ebd297e Do not try to render posts/comments which are not present 
refs diaspora/diaspora#4959
 2014-05-16 09:48:14 -04:00
Lukas Matt
7ef802127e Added confirm-dialog to report-delete-button 
* changed button description
* replaced links with buttons
 2014-05-15 07:23:44 -04:00
Lukas Matt
218845d5b4 Changed and renamed database columns 
* changed user_id type to integer
* renamed post_id to item_id
* renamed post_type to item_type
 2014-05-15 07:23:44 -04:00
Lukas Matt
26d0c81dae Added the ability to disable report-email-notification 
Podmin can see a extra checkbox in Settings > Account
for disabling report-email-notification
 2014-05-15 07:23:43 -04:00
Lukas Matt
2e36f8d375 Diaspora review part 1 
* join the conditions of the inner ifs
* add a uniqueness constraint to the model
* differentiate between author is a local or a remote user
* simplify controller/mailer functions
 2014-05-15 07:23:43 -04:00
Lukas Matt
1748d3b940 It is now possible to report comments 
* Renamed PostReport to Report
* Added report button to SPV
* Updated rspec

refs diaspora/diaspora#4732
refs diaspora/diaspora#4710
refs diaspora/diaspora#4711
refs diaspora/diaspora#4517
 2014-05-15 07:23:43 -04:00
Jason Robinson
62b5fea526 Merge pull request #4932 from Raven24/fix-bookmarklet 
port bookmarklet to Backbone.js, use gon for params
 2014-05-01 13:29:36 +03:00
Florian Staudacher
0d51bba959 port bookmarklet to Backbone.js, use gon for params (fixes #4931) 2014-04-19 17:41:21 +02:00
Steffen van Bergerem
232e4fa236 Improve set read/unread in notifications dropdown 2014-04-16 23:33:22 +02:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer 
Introduce message renderer
 2014-04-13 15:00:46 +03:00
Jason Robinson
7d9248b7ac Merge pull request #4854 from Flaburgan/fix-mobile-drawer 
Fix mobile drawer
 2014-04-12 21:46:54 +03: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
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
2d3933ccd8 Rewrite poll creation inputs 2014-04-06 15:01:18 +00:00
Jannik Streek
4130592ca5 fixed bookmarklet 2014-03-31 18:30:01 +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
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
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
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
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
flaburgan
027650e856 Add handle indication on search page, improve design 2014-03-13 23:01:42 +01:00
flaburgan
1250973267 Fix publisher broken after jquery upgrade 2014-03-12 18:41:38 +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
5d44a70e62 Fix different button sizes in new publisher 2014-03-11 17:32:07 +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
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
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
flaburgan
a7c7e4b1e3 Refactor right side bar, see you, BRs. 2014-02-20 13:01:07 +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
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
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ß
f64f55b567 Move help page initialization into backbone router 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
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
goobertron
7bcea07b99 Standardise - code refs to 'messages' to 'conversations' 2014-02-09 15:44:12 +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
Steffen van Bergerem
3d4bdfb665 Drop number of followers from tags page 2014-01-21 14:49:05 +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
97b5c723af Updated image branding and files with refs to them 2014-01-18 13:03:59 +00: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
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ß
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
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
arlogn
61bfbc82e0 bookmarklet publisher more usable 2014-01-06 01:07:05 +01:00
Steffen van Bergerem
2e50a16567 fix bug in conversations view causing server error 2014-01-04 01:54:45 +01:00
Steffen van Bergerem
55b967caf9 remove participants popover + improve conversations menu 2014-01-01 21:58:56 +01: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
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ß
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
flaburgan
748599a9dd Refactor mobile publisher 2013-11-29 12:30:20 +01: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
3df0fdc09b Improve the management of the contacts visibility settings in an aspect 2013-11-07 12:55:35 -08:00
flaburgan
47645dd985 Put the stream first in the left menu 2013-11-04 17:46:45 -08: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
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
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
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
4da696253a implement publisher uploader as backbone view 2013-09-03 23:18:18 +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
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
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
Jonne Haß
eda65f3258 Merge pull request #4464 from movilla/profile_mobile_500 
Error 500 when visit probile mobile and logged out. Fix #4458
 2013-08-29 05:19:18 -07:00
movilla
2b97f74015 error 500 when visit probile mobile and logged out. Fix #4458 2013-08-29 12:18:53 +02:00
Srihari Sriraman
0bcc62f07f Disable 'Mark all as read' for notifications when everything is read 
- This action needn't be performed when all notifications are read,
  hence disabling it is a good practice
- Added a link-disabled-color
- Used css pointer-events to disable clicking on the link

Preventing default on click for the mark_all_read_link

- avoiding the use of pointer-events
- setting up disabled only for mark_all_read_link

Moved disabling of the link to a global handler

- Added disabled class to the button in /notifications when all are read
- Styled the disabled button
- Adding disabled class after completion of ajaxRequest
 2013-08-29 12:12:26 +02:00
svbergerem
fa7a03e9a7 Fix style in profile sidebar / contacts 2013-08-28 13:07:01 +02:00
Jonne Haß
17580c123d Merge pull request #4353 from netom/oembed_to_mobile_view 
Added oembed display to mobile stream view

Conflicts:
	app/views/status_messages/_status_message.mobile.haml
 2013-08-27 21:59:00 +02:00
Steffen van Bergerem
324b09a72a add help page 2013-08-26 15:26:18 +02:00
Jonne Haß
1067d6a731 fix link to the tutorials in the sidebar [ci skip] 2013-08-26 10:54:27 +02:00
Jonne Haß
f9a3990562 do not leak photos through photos#show 2013-08-26 09:39:39 +02:00
Jonne Haß
e58019fe8e Merge pull request #4440 from Flaburgan/fix-contacts-page 
Add aspect modification and fix check icon regression on contacts page, close #4397
 2013-08-25 15:46:11 -07:00
flaburgan
96e18c6a7b Add aspect modification and fix check icon regression on contacts page, close #4397 2013-08-25 21:42:32 +02:00
Jonne Haß
348a7b6c5b update branding 2013-08-25 18:21:14 +02:00
Jonne Haß
0d1bf85931 drop outdated hints from right sections 2013-08-25 18:21:14 +02:00
Jonne Haß
2124dba3e8 update header and footer links 2013-08-25 18:21:14 +02:00
Steffen van Bergerem
7fe972555a profile message and mention icons 2013-08-21 23:05:42 +02:00
flaburgan
ba886d127a Valid meta elements, add pod personalization 2013-08-21 10:30:20 +02:00
Steffen van Bergerem
d73da263d9 Unify profile sidebar 2013-08-19 14:57:42 +02:00
Jonne Haß
eea3818c45 streamline new profile sidebar elements 
* titlecase "Photos"
* Pull "See all" to the left (to match up with  "View all")
* Replace "See all" with "View all"
 2013-08-19 14:26:14 +02:00
Steffen van Bergerem
f22b4d7da7 Change contact list on profile page 2013-08-19 14:02:08 +02:00
carolina
f3817b996e Modify photos unless condition and loop through thumbnails and test 2013-08-19 12:49:39 +02:00
mokus
44d76fc6da rename contact_count to item_count 2013-08-19 12:49:38 +02:00
carolina
d7e6ec8a4c Add photo count 2013-08-19 12:49:38 +02:00
carolina
a7bfc542e1 Add view_all link below photo thumbnails 2013-08-19 12:49:38 +02:00
carolina
9a5691c46a Add to leftsidebar link to photos index + thumbnails from last 3 photos 2013-08-19 12:39:51 +02:00
movilla
d1c679cc22 remove comments from the mobile site. Close #4225 2013-08-16 22:14:52 +02:00
movilla
73825ab94a Remove post from the mobile site 2013-08-16 20:44:22 +02:00
flaburgan
485c0dae7f Remove placeholders for name fields in settings (no more Sofaer) 2013-08-13 19:03:16 +02:00
movilla
152c08963a fix mobile search tags 2013-08-12 16:01:26 +02:00
Bender Bending Rodríguez
7086055f4e Bitcoin donations 2013-08-11 15:31:05 +02:00
Antoine D
ef24275f7c Make contacts visible in new aspect unchecked by default, close #4343 2013-08-09 22:13:40 +02:00
flaburgan
ac533f8383 Refactor the left bar side menu, improve tag autosuggestion design, close #4271 2013-08-06 18:30:24 +02:00
Fábián Tamás László
32d86254b5 Added oembed display to mobile stream view 2013-08-06 07:02:04 +02:00
Fábián Tamás László
54b166bde9 Opengraph to mobile view 2013-08-04 15:47:10 +02:00
J. Fleming
b75bb8dc0a Change devise config and templates to make logout a delete request. 2013-07-17 21:00:18 +02:00
Tamas Laszlo Fabian
37505c5ece Fixed timago tooltip in conversations 
Fixed timeago errors

Added cucumber stuff to test timeago at inbox

Show localized date/time in tooltip

Remove title attributes
 2013-07-07 14:43:47 +02:00
fabianfiorotto
3e5b29b289 Fix pagination for people list on the tag stream page 
Update _index.html.haml

This params broken the pagination of the followers list in tags page
To reproduce try to paginate in
https://joindiaspora.com/tags/diaspora

test for people pagination patch

reducing the per page limit

removing tabs
 2013-07-06 13:10:29 +02:00
Fábián Tamás László
aa472b25de Put preloads into gon.preloads 
Fixed tagFollowing not getting into preloads
 2013-07-06 12:45:23 +02:00
Fábián Tamás László
fb9b3e35c3 Put current user into gon 
Fixed bug in app.js, removed unnecessray test
 2013-07-06 12:44:08 +02:00
Jonne Haß
3da9b1bf7f Merge pull request #4259 from netom/4173-disable-invite-button 
Disable invite button after sending invite

Conflicts:
	Changelog.md
 2013-07-06 12:40:05 +02:00
kevivmatrix
6623e86a5a private message sending changed to ajax 
added specs for change in controller

one form of hash used in single line of code

rendering create response on sending message

redirect user to conversation page if message sent successfully

removed deprecated way of rendering file

conversations create for mobile fixed

minor code style change

updated changelog
 2013-07-06 14:35:09 +05:30
Fábián Tamás László
6e178af551 Disable invite button after sending invite 2013-07-01 10:19:56 +02:00
Jonne Haß
30dff802d5 Merge pull request #4243 from davexunit/feature/2948 
Show the user if a contact is sharing with them when viewing their profile page
 2013-06-29 10:16:41 +02:00
Jonne Haß
92d3bb9c69 Merge pull request #4252 from Raven24/diasp-feature/1283-coppa-admin 
Admin: find users under the age of 13 (COPPA)
 2013-06-29 10:03:59 +02:00
Jonne Haß
837a1ba564 Merge pull request #4238 from Flaburgan/patch-4 
Improve participants link style, close #4236
 2013-06-27 23:09:40 -07:00
Antoine D
8e2633f8b3 Improve participants link style in conversation, close #4236 
Move it to the right and replace the text by an image with the nice tooltip, modify the test.
 2013-06-28 00:41:44 +02:00
Florian Staudacher
44fbb6472f Merge branch 'feature/1283-coppa-admin' of https://github.com/diasp/diaspora into diasp-feature/1283-coppa-admin 2013-06-23 13:38:48 +02:00
David Thompson
1e5ef88d8c Use PeopleHelper#sharing_message view helper method in the profile sidebar. 2013-06-19 22:04:07 -04:00
Steffen van Bergerem
ffb150f227 Show avatar of recent user in conversation list 2013-06-19 22:59:05 +02:00