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
