Jonne Haß
|
604d2b7a39
|
Merge pull request #5634 from svbergerem/remove-photo-export
Remove photo export from settings
|
2015-02-07 21:10:33 +01:00 |
|
Jonne Haß
|
02071fcf51
|
updated 95 locale files [ci skip]
|
2015-02-07 20:33:43 +01:00 |
|
Steffen van Bergerem
|
7e5f5964e9
|
Remove photo export from settings
|
2015-02-07 14:59:18 +01:00 |
|
Steffen van Bergerem
|
8b33b9eb18
|
Merge pull request #5602 from Faldrian/more-shortcuts
Add shortcuts for reshare, expand Post and open first link in a post
Conflicts:
config/locales/diaspora/en.yml
|
2015-02-07 14:41:56 +01:00 |
|
Jonne Haß
|
ee06185244
|
Merge pull request #5632 from svbergerem/fix-aspect-dropdown-people-search
Fix aspect dropdown on people search page inserted after initial page load
|
2015-02-07 13:26:11 +01:00 |
|
Steffen van Bergerem
|
5e98308b2c
|
Fix aspect dropdown on people search page inserted after initial page load
|
2015-02-07 11:22:26 +01:00 |
|
Dumitru Ursu
|
0829e6f394
|
Add collation and config check
|
2015-02-06 00:49:07 +02:00 |
|
Jason Robinson
|
28ff7fb557
|
Merge pull request #5601 from Faldrian/5591-correct-moderation-placement-reshare
Fixed moderation-button-position when viewing reshare
|
2015-02-05 22:25:28 +02:00 |
|
Augier
|
4be1e2b38e
|
Does not display the header on sing_in page
|
2015-02-04 23:45:13 +01:00 |
|
Jonne Haß
|
73e30776e2
|
Merge pull request #5619 from sam09/change_msg
Fixed Isssue #5618. The profile update page shows the correct message.
|
2015-02-03 12:25:44 +01:00 |
|
Sam Radhakrishnan
|
9fcef5b101
|
Fixed Isssue #5618. The profile update page shows the correct message.
|
2015-02-03 14:39:08 +05:30 |
|
Faldrian
|
db6464ed61
|
Fixed moderation-button-position when viewing reshare
|
2015-02-03 00:24:26 +01:00 |
|
Jonne Haß
|
c61a4a91a5
|
update changelog [ci skip]
|
2015-02-02 15:46:31 +01:00 |
|
Jonne Haß
|
c9db65ae76
|
Merge pull request #5614 from sam09/develop
Fixed Bug #5593.
|
2015-02-02 15:25:54 +01:00 |
|
Sam Radhakrishnan
|
a12c0d83c0
|
Fixed Bug #5593. Added length validation to location in profile model with maximum length 255.
|
2015-02-02 19:42:53 +05:30 |
|
Steffen van Bergerem
|
b4ff1f97e7
|
Merge pull request #5612 from Flaburgan/hide-signup-button-when-registration-are-disabled
Hide sign up button when registration are disabled
|
2015-02-02 00:44:35 +01:00 |
|
Jonne Haß
|
3747fd728c
|
Merge pull request #5588 from goobertron/text_edits
Standardise capitalisation throughout UI
|
2015-02-01 16:03:22 +01:00 |
|
flaburgan
|
b8aaad6318
|
Hide sign up button when registration are disabled
|
2015-02-01 14:01:44 +01:00 |
|
Jason Robinson
|
512de9cfd9
|
Merge pull request #5597 from gdpelican/feature/json-exporter-post-fields
Add created_at to json posts for #5585
|
2015-02-01 13:18:48 +01:00 |
|
goobertron
|
42cd2337be
|
Amend all text strings in en locales to use sentence case
Adapt cukes to work with new capitalisation rules
|
2015-01-31 17:44:57 +00:00 |
|
Jonne Haß
|
9bfabe677a
|
Merge pull request #5599 from AugierLe42e/fix-stats-page-regristration
Fix registrations displaying
|
2015-01-30 19:16:12 +01:00 |
|
Augier
|
55d258c5ac
|
Fix registrations displaying
|
2015-01-30 18:00:22 +01:00 |
|
Faldrian
|
099974ddef
|
Add shortcuts for reshare, expand Post and open first link in a post
|
2015-01-28 16:19:18 +01:00 |
|
James Kiesel
|
43f48d0ae2
|
Add created_at to json posts for #5585
|
2015-01-28 10:21:16 +13:00 |
|
Jonne Haß
|
aaadf2926f
|
Merge pull request #5595 from AugierLe42e/statistics-page-fix
Fix available services not correctly displayed
|
2015-01-26 23:41:34 +01:00 |
|
Augier
|
4ff5483025
|
Fix available services not correctly displayed
|
2015-01-26 20:45:03 +01:00 |
|
Jason Robinson
|
928080176a
|
Merge pull request #5590 from Flaburgan/fix-monthly-halfyear-active-users-count
Fix monthly and halfyear active users count
|
2015-01-26 11:55:40 +02:00 |
|
Flaburgan
|
69b881f34b
|
Fix monthly and halfyear active users count
|
2015-01-26 10:03:37 +01:00 |
|
Jason Robinson
|
ccd7561072
|
Merge pull request #5587 from AugierLe42e/fix-statistics-design
Fixes the header problem rendering statistics page
|
2015-01-25 15:16:18 +02:00 |
|
Augier
|
f14ad5ce35
|
Fixes the header problem rendering statistics page
|
2015-01-25 13:24:19 +01:00 |
|
Jason Robinson
|
cc52a5b91f
|
Merge pull request #5547 from Faldrian/spv_moderation_buttons
Buttons for ignore, hide, delete on SPV
|
2015-01-25 13:33:00 +02:00 |
|
Faldrian
|
31c39a59d1
|
Added post moderation buttons in SPV
|
2015-01-25 05:11:59 +01:00 |
|
Jonne Haß
|
d02102c7d0
|
Merge branch 'develop' of github.com:diaspora/diaspora into develop
|
2015-01-24 23:58:12 +01:00 |
|
Jonne Haß
|
9eaa92068f
|
Merge pull request #5464 from SansPseudoFix/statistics_design
[Feature] Statistics page
|
2015-01-24 23:57:40 +01:00 |
|
Augier
|
dd9c2f2c6b
|
Feature : Statistics design
|
2015-01-24 22:37:40 +01:00 |
|
SansPseudoFix
|
dc44485230
|
Feature : Statistics design
|
2015-01-24 22:34:41 +01:00 |
|
Jonne Haß
|
d48b787fb6
|
Merge pull request #5584 from Faldrian/cucumber-specify-fx-version
Added environment-variable to specify Firefox version for testing
|
2015-01-24 16:51:55 +01:00 |
|
Faldrian
|
913d9827e7
|
Added support for environment-variable to specify firefox-binary for selenium-testing
|
2015-01-24 16:24:20 +01:00 |
|
Jason Robinson
|
f8fdbed3e8
|
Merge pull request #5582 from SansPseudoFix/5568-fix-data-overflow-json-exporter
fix #5568 - overflow json exporter
|
2015-01-23 21:54:46 +02:00 |
|
Jonne Haß
|
caab38875b
|
tell people to stop the server while running migrations [ci skip]
|
2015-01-23 14:23:47 +01:00 |
|
SansPseudoFix
|
7e9525740b
|
fix #5568 - overflow json exporter
|
2015-01-21 17:54:59 +01:00 |
|
Jonne Haß
|
cd6475d572
|
Merge pull request #5562 from sjain1107/5560-Hide-community-spotlight
5560 Hide community spotlight setting if not enabled
|
2015-01-21 05:38:25 +01:00 |
|
Jonne Haß
|
a7d652c7c9
|
Merge pull request #5530 from dimaursu/emoji
Convert MySQL fields to 4 byte unicode
|
2015-01-21 02:34:53 +01:00 |
|
Dumitru Ursu
|
28fdba5d89
|
Shorten indexes
Fix merge conflict
|
2015-01-20 22:41:52 +02:00 |
|
Jonne Haß
|
3674a5a00c
|
Merge pull request #5578 from gdpelican/bugfix/json-exporter
Fix bad email formatting
|
2015-01-20 13:32:18 +01:00 |
|
Sakshi Jain
|
8b1f0453a1
|
5560 Hide community spotlight setting if not enabled
|
2015-01-20 10:31:31 +05:30 |
|
James Kiesel
|
7bbd9138de
|
Fix bad email formatting
|
2015-01-20 16:51:08 +13:00 |
|
Jonne Haß
|
6502000429
|
Merge pull request #5574 from svbergerem/fix-linkify
Fix markdown-it linkify blocking Firefox
|
2015-01-19 15:02:00 +01:00 |
|
Steffen van Bergerem
|
b63d8fc679
|
Fix markdown-it linkify blocking Firefox
|
2015-01-19 02:09:10 +01:00 |
|
Dumitru Ursu
|
a733a774d1
|
Refactor & DRY encoding migration
Dynamic row for MySQL
Set larger column index sizes
|
2015-01-19 02:19:39 +02:00 |
|