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

531 commits

Author SHA1 Message Date
Steffen van Bergerem
232e4fa236 Improve set read/unread in notifications dropdown 2014-04-16 23:33:22 +02:00
flaburgan
a4886fa77b SPV: Improve padding and interaction counts 2014-04-13 11:27:12 +02: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
57de031f6b I added the validation for blank to poll question and poll answer 2014-04-07 17:17:41 +00:00
Hincu Petru
2d3933ccd8 Rewrite poll creation inputs 2014-04-06 15:01:18 +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
Jannik Streek
4130592ca5 fixed bookmarklet 2014-03-31 18:30:01 +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
d0a77ce6b3 design for poll participation implemented, saving works as well 2014-03-31 18:14:07 +02:00
Jannik Streek
18a43295b7 poll form completed 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
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ß
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
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
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
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
Hincu Petru
638744b914 Fixed #4693 2014-03-15 15:25:18 +00:00
flaburgan
027650e856 Add handle indication on search page, improve design 2014-03-13 23:01:42 +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
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
vcuculo
96fc16f9b5 Fixed heart icon height in right sidebar 2014-02-23 15:02:44 +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
a2b3917505 Add participants to conversations menu 2014-02-09 19:55:10 +01:00
flaburgan
119ed2d8f5 Fix nav in header empty with webkit browser 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
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
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ß
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
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
fe01734a3d fix timeago 2014-01-29 03:24:10 +01:00
Steffen van Bergerem
763fb95947 Fix css for keyboard navigation 2014-01-26 04:31:11 +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ß
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
Steffen van Bergerem
20e1626453 add permalinks for comments 2014-01-17 22:11:17 +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
Steffen van Bergerem
580068ed7c Remove background from badges in header 2014-01-14 15:00:36 +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
55b967caf9 remove participants popover + improve conversations menu 2014-01-01 21:58:56 +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
Steffen van Bergerem
a96611c259 use bootstrap labels 2013-12-16 00:46:55 +01: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
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
933c3b01ca remove old styles 2013-12-07 12:03:26 -02:00
Jonne Haß
d18bbd8405 Merge pull request #4604 from Flaburgan/refactor-mobile-publisher 
Refactor mobile publisher
 2013-12-02 00:07:08 +01:00
flaburgan
748599a9dd Refactor mobile publisher 2013-11-29 12:30:20 +01:00
flaburgan
7a50e79cfa Fix aspect dropdown on contacts page 2013-11-27 13:07:31 -08: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
58886a6b30 Improve notifications and conversations views design 2013-11-16 03:06:25 -08:00
flaburgan
76b151eb7d Fix avatar display on mobile profile 2013-11-16 01:57:37 -08:00
flaburgan
1833edfd67 Add actions to contacts/index.html page 2013-11-12 19:10:00 -08:00
flaburgan
0f2773053e refactor mobile header, close #4579 2013-11-09 23:21:32 -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
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
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ß
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
flaburgan
126e7bdc9c Refactor getting_started page, test if facebook is available, fix #4520 2013-09-18 22:06:47 -07:00
flaburgan
fcad95109f Change .timeago color and align notification, fix #4502 2013-09-17 14:50:32 -07:00