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

3101 commits

Author SHA1 Message Date
Jonne Haß
a7699c2a2c Update configurate and enable missing key exceptions 
closes #5934
 2015-05-07 04:03:43 +02:00
Jonne Haß
166a152dc0 Merge branch 'master' into stable 2015-05-06 23:53:52 +02:00
Jonne Haß
51918a798a bump to 0.5.0.1 2015-05-06 23:52:40 +02:00
Dennis Schubert
d27061d5d6 Set captcha length correctly, fix #5932 2015-05-06 23:51:28 +02:00
Jonne Haß
f1c75e6a54 Bump open_graph_reader 
It now returns the origin for a missing og:url
 2015-05-04 23:43:53 +02:00
efstrian
63be9d57b6 Issue #5884: Added link to diasporafoundation.org to invitation email (en) 2015-05-04 04:42:08 +02:00
Jonne Haß
db08cec9c0 update changelog and version for 0.5.1.0 2015-05-04 00:41:55 +02:00
Jonne Haß
69842b84a4 Merge branch 'master' into develop 2015-05-03 15:48:42 +02:00
Jonne Haß
8e2278b80d Merge branch 'release/0.5.0.0-RC' into develop 2015-05-03 15:43:55 +02:00
Jonne Haß
260a10b2f2 updated 60 locale files [ci skip] 2015-05-03 15:43:35 +02:00
Jonne Haß
fe64db013b Merge pull request #5888 from szlend/5508-fix-post-presenter-autoreload 
Issue #5508: Remove post_presenter from initializers
 2015-04-30 13:06:21 +02:00
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +02:00
Benjamin Neff
3c09756417 refactoring javascript and controller 
- move to contacts.js
- use json
- move to aspects_controller
- add route
- rewrite test
- fix css in chrome
 2015-04-28 01:57:43 +02:00
Simon Žlender
bec886109f Issue #5508: Remove post_presenter from initializers 2015-04-25 17:21:07 +02:00
Dennis Schubert
67a6c8be0c Merge pull request #5877 from SuperTux88/fix-notification-mails 
fix notification mails for limited posts
 2015-04-25 01:09:46 +02:00
Jonne Haß
0bad6dba88 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-22 20:58:54 +02:00
Jonne Haß
6e546ff2bf Trigger exports through a POST request 
GET requests don't get any CSRF protection by Rails,
thus these sensitive actions should be better protected.

Thanks to @tomekr for the report.
 2015-04-22 20:20:10 +02:00
Benjamin Neff
84c3814b94 fix notification mails for limited posts 2015-04-22 19:59:08 +02:00
Jonne Haß
d959dd725b Merge pull request #5850 from svbergerem/modal-for-new-aspect 
Use Bootstrap modal for new aspect form
 2015-04-20 22:34:51 +02:00
Jonne Haß
85c376e591 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-19 15:58:41 +02:00
goobertron
a75ec75ec7 Update aspect edits text, reorder posting section 
First iteration to update Help section

Changes from Fla
 2015-04-19 15:57:21 +02:00
Jonne Haß
b3575ab56f Merge branch 'release/0.5.0.0-RC' into develop 2015-04-14 15:42:33 +02:00
goobertron
a687a8dc01 Update help text for renaming an aspect 2015-04-14 15:40:58 +02:00
Steffen van Bergerem
895d38de21 Refactor available services settings 2015-04-08 18:43:35 +02:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
Jonne Haß
4b841ef076 Merge pull request #5843 from margori/private_post_subject_content 
Limited post content excluded from subject of comment email
 2015-04-04 00:39:40 +02:00
Marcelo Briones
aa6b590b3c Limited post content excluded from subject of comment email 2015-04-03 16:37:17 -03:00
Steffen van Bergerem
07a344d051 Disable auto follow back on aspect deletion 2015-04-03 14:10:14 +02:00
Jonne Haß
179654071b Move default_url_options to application.rb 
Apparently the subclasses got loaded before the initializers
were run, thus not inheriting the config.
 2015-04-01 14:59:07 +02:00
Jonne Haß
0881810f4e Merge branch 'release/0.5.0.0-RC' into develop 2015-04-01 03:07:30 +02:00
Jonne Haß
9d4e7f3953 Merge pull request #5830 from svbergerem/fix-text-contact-page 
Contacts page: remove broken title from 'Start a conversation' button
 2015-04-01 02:54:18 +02:00
Steffen van Bergerem
fdf3817ee2 Update javascript styleguide 2015-04-01 01:24:11 +02:00
Steffen van Bergerem
7870f3b127 Contacts page: remove broken title from 'Start a conversation' button 2015-04-01 00:47:31 +02:00
Jason Robinson
c0b8f03225 bump to 0.5.0.0-RC 2015-03-30 17:49:15 +03:00
Jonne Haß
e274470d55 Replace default.html with a regular view 
So we can correctly reference the images
 2015-03-28 23:12:07 +01:00
Jonne Haß
331f4ed988 updated 80 locale files [ci skip] 2015-03-27 11:44:44 +01:00
Steffen van Bergerem
9069fd235d Add 'no contacts in this aspect yet' message 2015-03-27 03:20:42 +01:00
flaburgan
ef977a170f Replace Make Something text by the diaspora ball logo on registration page 
Add ball.svg to /graphics
 2015-03-26 00:32:41 +01:00
Jonne Haß
42977333c4 fix javascript pluaralization rules 2015-03-23 20:53:52 +01:00
Jonne Haß
d4d68b10cc update plural rules 2015-03-23 19:27:38 +01:00
Jonne Haß
cb1203d36e updated 105 locale files [ci skip] 2015-03-23 15:51:27 +01:00
Jonne Haß
241d12d824 Merge pull request #5798 from svbergerem/remove-centered-layout 
Remove layout 'centered_with_header_with_footer'
 2015-03-20 01:51:27 +01:00
Steffen van Bergerem
d9bf4a2fa6 Remove layout 'centered_with_header_with_footer' 2015-03-18 21:59:56 +01:00
Steffen van Bergerem
6d070c818c Use jshintrb and guard-jshintrb instead of jshint 2015-03-18 10:49:17 +01:00
Jonne Haß
256d7862b9 Merge pull request #5782 from svbergerem/reshared-poll 
Display reshared poll
 2015-03-15 20:45:51 +01:00
Steffen van Bergerem
81cd1753e4 Improve link to original post in reshared polls 2015-03-15 17:07:16 +01:00
Hincu Petru
9589cb2e0f disable poll voting for reshared post 2015-03-15 16:46:48 +01:00
Sayed
18a1958ef8 fix too long tag name #5737 2015-03-15 16:15:33 +02:00
Steffen van Bergerem
84a5992a42 Refactor css code, remove unused code 2015-03-13 01:41:14 +01:00
Jonne Haß
2c7b7bb0dc bump open_graph_reader 2015-03-11 21:59:02 +01:00