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

14400 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jonne Haß
5c8d615b67 Merge pull request #4907 from goobertron/poll_i18n_fix 
Fix missing translation in #4905
 2014-04-05 19:16:06 +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
Florian Staudacher
dff486f1ec Merge pull request #4900 from MrZYX/drop_rmagick 
Drop rmagick
 2014-04-04 23:33:55 +02:00
Jonne Haß
02ed7144a0 drop rmagick, fixes #4594 
This breaks the screenshot tool.

RMagick no longer compiles on recent ImageMagicks that have HDRI
support enabled.
 2014-04-04 20:41:37 +02:00
Jonne Haß
5a60cb72bf Merge pull request #4899 from hpetru/poll-in-post-preview 
Add poll in post preview
 2014-04-04 14:12:13 +02:00
Hincu Petru
f356ae7216 Add poll in post preview 2014-04-04 11:45:33 +00:00
Jonne Haß
c634aba267 Merge branch 'develop' of github.com:diaspora/diaspora into develop 2014-04-04 10:01:30 +02:00
Jonne Haß
5d62c17259 Merge pull request #4898 from mehmetaergun/patch-1 
Fix tr in locale settings
 2014-04-04 09:56:00 +02:00
Jonne Haß
be19c2f104 Merge pull request #4897 from hpetru/update-poll-view-in-stream 
I update design for poll in post stream
 2014-04-04 09:54:06 +02:00
Mehmet Atif Ergun
a3fd746f15 Fix tr 
The translation 'türk' is ethnicity / nationality. change to language, türkçe.
 2014-04-03 20:31:00 -04:00
Hincu Petru
6c00db23cd I update design for poll in post stream 2014-04-03 20:57:14 +00:00
Jonne Haß
9eb2339368 Merge pull request #4894 from hpetru/4893-poll-in-spv 
Add poll for single post view
 2014-04-03 20:36:34 +02:00
Jonne Haß
6ba6ecf3f2 updated 138 locale files [ci skip] 2014-04-03 20:12:30 +02: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ß
8d20be6f65 Looks like I didn't pay enough attention while hitting that green button, sorry 
Merge branch 'master' into develop
 2014-04-02 08:58:21 +02:00
Jonne Haß
3e68aaaa3b Merge pull request #4890 from svbergerem/fix-bootstrap-publisher-ui-glitch 
Fix ui glitch in Bootstrap publisher
 2014-04-01 10:45:40 +02: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
Steffen van Bergerem
35b1ba088e Fix ui glitch in Bootstrap publisher 2014-03-31 22:38:45 +02:00
Hincu Petru
552310796c Catch error from decodeURI for prevent crash in posts parsing 2014-03-31 20:24:47 +00:00
Jonne Haß
faad980df0 Merge pull request #4861 from JannikStreek/feature/3676-conduct_polls 
Feature/3676 Conduct Polls
 2014-03-31 20:02:29 +02: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
167884e565 added changelog pull link 2014-03-31 18:14:08 +02:00
Jannik Streek
a3837a4f19 added changelog entry 2014-03-31 18:14:07 +02:00
Jannik Streek
2d0abbae23 added jasmine test for poll view 2014-03-31 18:14:07 +02:00
Jannik Streek
dde39aa1bb added jasmine publisher tests 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
Jonne Haß
0ea53aa5ed Merge pull request #4882 from hpetru/4868-mention-inside-tags 
4868 mention inside tags
 2014-03-31 12:06:39 +02:00
Hincu Petru
b43e56485d Fixed jquery event listener from notifications-badge.js 2014-03-31 09:52:07 +00:00
Hincu Petru
2be528494a Fix jquery.mentionInput.js plugin 2014-03-31 08:51:40 +00:00