Jonne Haß
|
898e8d5912
|
Remove deprecated port setting
|
2015-05-19 11:07:03 +02:00 |
|
Dennis Schubert
|
6a1ec27b3c
|
Merge branch 'stable' into develop
|
2015-05-19 02:58:41 +02:00 |
|
Steffen van Bergerem
|
ceec5084af
|
Use case insensitive unconfirmed email
closes #5967
|
2015-05-19 02:58:37 +02:00 |
|
Dennis Schubert
|
00cb87ce11
|
Merge branch 'stable' into develop
|
2015-05-19 02:55:36 +02:00 |
|
Jonne Haß
|
4bde00177c
|
replace foreman with eye
closes #5966
|
2015-05-19 02:55:31 +02:00 |
|
Jonne Haß
|
a21de8b190
|
Make listen directive for Unicorn configurable
|
2015-05-19 02:55:01 +02:00 |
|
Dennis Schubert
|
3ae370780c
|
Merge branch 'stable' into develop
|
2015-05-16 03:42:18 +02:00 |
|
Akash Agrawall
|
8c7aa38aba
|
Indicates in the setting that the email is not visibile to the other users #5315
|
2015-05-16 03:41:52 +02:00 |
|
Jonne Haß
|
b6cbb17d83
|
Merge branch 'stable' into develop
|
2015-05-12 14:20:09 +02:00 |
|
goobertron
|
2668c487e7
|
Remove dupe line from en.yml [ci skip]
closes #5951
|
2015-05-12 14:20:03 +02:00 |
|
Dennis Schubert
|
aac0a2582e
|
Merge branch 'stable' into develop
|
2015-05-12 04:00:12 +02:00 |
|
Steffen van Bergerem
|
40bb44eb96
|
Mobile: manage followed tags
closes #5945
|
2015-05-12 04:00:07 +02:00 |
|
Dennis Schubert
|
3f3148af2c
|
Merge branch 'stable' into develop
|
2015-05-10 02:00:41 +02:00 |
|
Steffen van Bergerem
|
0c5443d543
|
Make js-routes use compact and camelcase function names
closes #5941
|
2015-05-10 02:00:30 +02:00 |
|
Steffen van Bergerem
|
1428369849
|
Mobile: Add button to follow/unfollow tags
|
2015-05-10 01:59:50 +02:00 |
|
Jonne Haß
|
ddf1b6ea8b
|
Merge branch 'stable' into develop
|
2015-05-07 22:08:30 +02:00 |
|
Jonne Haß
|
f0d51e24b8
|
Fix invalid setting calls in config/unicorn.rb
* .present? is an AS extension that isn't loaded at this point
* single_process_mode is defined in environment, not at the toplevel
|
2015-05-07 22:07:22 +02:00 |
|
Dennis Schubert
|
b05d183f91
|
Merge branch 'stable' into develop
|
2015-05-07 04:10:28 +02:00 |
|
Steffen van Bergerem
|
06e6e1db78
|
Remove private post content of also commented mails
merges #5931
|
2015-05-07 04:10:21 +02:00 |
|
Dennis Schubert
|
642c4597e1
|
Merge branch 'stable' into develop
|
2015-05-07 04:03:57 +02:00 |
|
Jonne Haß
|
a7699c2a2c
|
Update configurate and enable missing key exceptions
closes #5934
|
2015-05-07 04:03:43 +02:00 |
|
Jonne Haß
|
4612937787
|
Merge branch 'stable' into develop
|
2015-05-06 23:56:23 +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 |
|
Dennis Schubert
|
17fbbeea69
|
Merge branch 'stable' into develop
|
2015-05-04 23:43:58 +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 |
|
Dennis Schubert
|
9db8cea504
|
Merge branch 'stable' into develop
|
2015-05-04 04:42:20 +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ß
|
4fad5041cf
|
update changelog and version for 0.6.0.0
|
2015-05-04 00:47:36 +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 |
|
Steffen van Bergerem
|
4f4dfc7554
|
Fix missing assets bug
|
2015-03-11 19:18:05 +01:00 |
|
Jonne Haß
|
e7b92c15e2
|
Replace export_photos and export_users by export queue
|
2015-03-06 00:38:16 +01:00 |
|
Marcelo Briones
|
b154d87070
|
Exports user photos as zip file
|
2015-03-03 19:45:57 -03:00 |
|
Jonne Haß
|
dd45b79a98
|
Drop Youtube oembed HTTPS hack
upstream ships it now that way
|
2015-03-02 02:34:51 +01:00 |
|
Jonne Haß
|
c9729d66d6
|
Explicitly set log level for production environment
|
2015-03-02 01:34:50 +01:00 |
|
Steffen van Bergerem
|
e188782a9a
|
Remove blueprint code
|
2015-03-02 00:04:57 +01:00 |
|
Jonne Haß
|
fb6d3db7c7
|
bump autoprefixer-rails
|
2015-02-28 02:36:14 +01:00 |
|
Jonne Haß
|
a0c22659d5
|
Monkey patch to prevent dumping limit on boolean fields
|
2015-02-27 17:00:41 +01:00 |
|
Jonne Haß
|
162303db37
|
Enable Rails 5 behavior for exceptions in after_commit callbacks
|
2015-02-27 16:58:39 +01:00 |
|
Jonne Haß
|
3a8302ff7f
|
serve_static_assets was renamed to serve_static_files
|
2015-02-27 16:58:38 +01:00 |
|
Jonne Haß
|
e46a77ba19
|
Merge pull request #5706 from aka001/help_section
Update the help section #5698
|
2015-02-27 15:57:12 +01:00 |
|
Jonne Haß
|
be1ab6c6a3
|
Merge branch 'collimarco-issue5350' into develop
|
2015-02-27 15:33:55 +01:00 |
|
Akash Agrawall
|
e85cb7b373
|
Help_section_update_keyboard_shortcut
|
2015-02-27 16:36:11 +05:30 |
|
Augier
|
168adae009
|
Adding help section for chat
|
2015-02-26 18:06:39 +01:00 |
|
Steffen van Bergerem
|
cdd1155bd2
|
JSHint: change values for bitwise and notypeof to the thoughtbot defaults [ci skip]
|
2015-02-22 13:42:02 +01:00 |
|
Jonne Haß
|
a19b91083e
|
Merge pull request #5643 from aka001/5564_lock_account
Lock account #5564
|
2015-02-19 03:43:38 +01:00 |
|
Akash Agrawall
|
3bb5e78893
|
Lock account #5564
|
2015-02-19 05:45:04 +05:30 |
|
flaburgan
|
2b19b4bfc9
|
Remove #sign-up-text, change placeholder text to lower-case, fix tests
|
2015-02-19 00:07:41 +01:00 |
|
flaburgan
|
1c231f3171
|
refactoring of the public pages design
|
2015-02-18 22:45:46 +01:00 |
|
Faldrian
|
8f3c03edfa
|
Added dropdown to add/remove people from/to aspects in mobile view
|
2015-02-15 22:08:15 +01:00 |
|
Steffen van Bergerem
|
c5468f072f
|
JSHint: Add spyOn as a global variable
|
2015-02-14 19:44:00 +01:00 |
|
Augier
|
aa62266376
|
Added routing system to open a section in help
|
2015-02-14 18:05:40 +01:00 |
|
Jonne Haß
|
f980eba0a3
|
add a missing translation
|
2015-02-14 12:43:48 +01:00 |
|
Lukas Matt
|
a475d5fb62
|
Add the ability to link to remote user profile
related to diaspora/jsxc#77
|
2015-02-13 19:23:26 +01:00 |
|
Jonne Haß
|
dece3cf6b0
|
Merge pull request #5417 from svbergerem/notifications-fix-timeago
Fix timeago for notifications, add 'no notifications yet' message
|
2015-02-10 12:20:09 +01:00 |
|
Steffen van Bergerem
|
f27b9dbf79
|
JSHint disable maxlen and quotmark [ci skip]
|
2015-02-10 00:43:06 +01:00 |
|