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

7045 commits

Author SHA1 Message Date
Lukas Matt
0fae1137fa Using unless instead of 'if !' 2014-05-15 07:23:43 -04:00
Lukas Matt
1a0c9f5983 Make report-type translatable 2014-05-15 07:23:43 -04:00
Lukas Matt
6f21ccda06 Using case instead of equal 2014-05-15 07:23:43 -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
719edcd1a7 Added missing action in report controller 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
ed96ddac98 Display status when the user send a report 2014-05-15 07:23:43 -04:00
Lukas Matt
d23f4a66da Cleaned javascript report view 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
9da3bc347b disable publisher after successfully posting in standalone mode 2014-04-25 19:51:45 +02:00
Florian Staudacher
0d51bba959 port bookmarklet to Backbone.js, use gon for params (fixes #4931) 2014-04-19 17:41:21 +02:00
flaburgan
b1f59a9b53 Switch back from Roboto to Helvetica on bootstrap pages 2014-04-18 18:34:25 +02:00
Steffen van Bergerem
232e4fa236 Improve set read/unread in notifications dropdown 2014-04-16 23:33:22 +02:00
Steffen van Bergerem
e1685c9a29 Remove auto 'mark as read' for notifications 2014-04-15 14:51:38 +02:00
Jason Robinson
07ae7d7862 Merge pull request #4426 from Flaburgan/fix-padding-spv 
[Ready to merge] fix padding between panels
 2014-04-13 15:08:29 +03:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer 
Introduce message renderer
 2014-04-13 15:00:46 +03:00
flaburgan
a4886fa77b SPV: Improve padding and interaction counts 2014-04-13 11:27:12 +02:00
Jason Robinson
7d9248b7ac Merge pull request #4854 from Flaburgan/fix-mobile-drawer 
Fix mobile drawer
 2014-04-12 21:46:54 +03:00
Jason Robinson
ee3a9f9be0 Merge pull request #4912 from goobertron/settings 
Reorder items on settings page and improve wording
 2014-04-12 21:37:52 +03: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
2311b761e1 Redirect to stream_path if is destkop 2014-04-08 09:34:14 +00: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
Jonne Haß
682a49605e Merge pull request #4910 from hpetru/rewrite-poll-creator 
Rewrite poll creation inputs
 2014-04-06 22:27:01 +02:00
Jannik Streek
095d616198 fixed federation issue due to missing delegation + test + some minor tweaks 
fixed indenting

renamed test
 2014-04-06 20:58:58 +02:00
Hincu Petru
2d3933ccd8 Rewrite poll creation inputs 2014-04-06 15:01:18 +00:00
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
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
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
Hincu Petru
fed5ea8cda Refactored poll_view.js 2014-04-02 16:19:07 +00: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
Hincu Petru
552310796c Catch error from decodeURI for prevent crash in posts parsing 2014-03-31 20:24:47 +00: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
2d0abbae23 added jasmine test for poll view 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