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

14324 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hincu Petru
7b42084cdb Refactoring method Notification#notify 2014-05-06 11:58:51 +00:00
Jason Robinson
15537e17c5 Merge pull request #4922 from Flaburgan/from-roboto-to-helvetica 
Switch back from Roboto to Helvetica on bootstrap pages
 2014-04-22 10:06:00 +03:00
flaburgan
b1f59a9b53 Switch back from Roboto to Helvetica on bootstrap pages 2014-04-18 18:34:25 +02:00
Jason Robinson
4bf96ddcd4 Merge pull request #4869 from svbergerem/improve-notifications-dropdown 
Improve set read/unread in notifications dropdown
 2014-04-17 10:14:46 +03:00
Steffen van Bergerem
232e4fa236 Improve set read/unread in notifications dropdown 2014-04-16 23:33:22 +02:00
Jason Robinson
b64e418020 Merge pull request #4810 from svbergerem/notifications-no-auto-mark-as-read 
Remove auto 'mark as read' in notifications dropdown
 2014-04-16 21:56:53 +03:00
Jonne Haß
441cc062f8 Merge pull request #4929 from santosgabriel/develop 
fix bug #4832 select language for email content when invite a friend
 2014-04-15 18:30:33 +02:00
Steffen van Bergerem
e1685c9a29 Remove auto 'mark as read' for notifications 2014-04-15 14:51:38 +02:00
Gabriel Lima
f6c0648a55 bug #4832 - send the rspec test and changelog 2014-04-15 09:23:58 -03:00
Gabriel Lima
00b6a39ad5 fix bug #4832 select language for email content when invite a friend 2014-04-14 18:56:29 -03: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
Jonne Haß
a9b29a5881 Merge pull request #4885 from jaywink/curl-warning 
Add warning to script/server if curl does not support AsyncDNS
 2014-04-13 13:14:36 +02: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
Jason Robinson
6947a1945c Merge pull request #4883 from MrZYX/uuid 
Use uuids for guid generation
 2014-04-11 16:40:57 +03:00
Jonne Haß
66c511197c Merge pull request #4917 from hpetru/4806-new-status_messages-page 
Redirect to stream_path if is destkop
 2014-04-08 13:45:04 +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
Jonne Haß
89a01525a9 Merge pull request #4911 from JannikStreek/feature/4904-poll_fed_issue 
Fix: federation issue with polls
 2014-04-06 22:25:26 +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
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