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
Jonne Haß
549c45e06f
No need anymore to update bundler on travis
2014-03-31 00:02:22 +02:00
Jonne Haß
5b4ab32c08
Merge pull request #4884 from MrZYX/stabilize_cukes
...
Stabilize cukes II
2014-03-30 23:09:22 +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ß
7ef5595e52
Try silly things to make mentions_from_profile_page.feature:38 more stable
2014-03-30 20:54:05 +02:00
Jonne Haß
bc46ee437c
Stabilze aspect_navigation.feature:18
...
... again
2014-03-30 20:18:58 +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
Jonne Haß
3a91061d4f
Merge pull request #4708 from goobertron/opengraph_link_fix
...
Opengraph link fix (issue #4492 )
2014-03-30 11:15:29 +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
Dennis Schubert
dfa41997df
Merge pull request #4855 from MrZYX/drop_rvmrc
...
Replace .rvmrc by .ruby-version
2014-03-25 23:58:05 +01:00
Jonne Haß
3f5838a75f
Merge pull request #4876 from fractalcat/wip-interface-fixes
...
Patch grammar in admin interface
2014-03-24 17:04:12 +01:00
Sharif Olorin
fc394c3981
Patch grammar in admin interface
2014-03-25 02:36:10 +11:00
Jonne Haß
1b70f6fe09
Replace .rvmrc by .ruby-version
...
Also relax the requirement. The .ruby-version represents
merely a recomendation for the Ruby version. The incompability
issues in the Ruby world are far less currently, than they were
when we introduced strict version enforcement. Thus strict
enforcement is no longer appropiate. Same holds for RubyGems.
This implicity also removes the recomendation on using RVM.
The .ruby-version file is supported by all major Ruby version
managers. Gemsets are no longer a needed feature since Bundler
handles multiple concurrrently installed Gems just well.
2014-03-24 15:33:29 +01: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
Jonne Haß
b0a4d5d439
Merge pull request #4870 from svbergerem/activate-hovercards
...
Activate hovercards in SPV and conversations
2014-03-23 11:36:56 +01:00
