Jason Robinson
|
9b08c58b5b
|
Fix path ignores in .gitignore to not ignore files inside the paths, but to ignore the path itself. Otherwise git clean -fd is scary as it says its removing them even if not
|
2013-12-05 09:50:04 +02:00 |
|
Jonne Haß
|
0fb962cd1d
|
Merge pull request #4602 from jaywink/central-hub
Statistics route with general info, some user and total posts stats
|
2013-12-02 13:22:06 -08:00 |
|
Jason Robinson
|
2c83d0e846
|
Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings.
|
2013-12-02 22:35:18 +02:00 |
|
Jonne Haß
|
3cd45a3732
|
Merge pull request #4614 from Flaburgan/complete-changelog
Complete changelog
|
2013-12-02 03:40:49 -08:00 |
|
flaburgan
|
b6e08fc39f
|
Complete changelog
|
2013-12-02 11:09:24 +01:00 |
|
Jonne Haß
|
1ce027eb2c
|
Merge pull request #4605 from manwithtwowatches/feature/4509-image-upload-response-errors
Feature/4509 image upload response errors
|
2013-12-02 00:10:25 +01:00 |
|
Jonne Haß
|
d18bbd8405
|
Merge pull request #4604 from Flaburgan/refactor-mobile-publisher
Refactor mobile publisher
|
2013-12-02 00:07:08 +01:00 |
|
Jonne Haß
|
4b1255fa8d
|
Merge pull request #4592 from Flaburgan/link-show-more-pictures-mobile
[Ready to review] Fix "more picture" indication (+n) on mobile by adding a link on the indication
Conflicts:
Changelog.md
|
2013-12-02 00:04:37 +01:00 |
|
Jonne Haß
|
b39b0f05d0
|
Merge branch 'develop' of github.com:diaspora/diaspora into develop
|
2013-12-02 00:01:02 +01:00 |
|
Jonne Haß
|
8baa06e477
|
Merge pull request #4590 from diaspora/4432-photo-lightbox-quickfix
Add lightbox html to unauthenticated header
Conflicts:
Changelog.md
|
2013-12-01 23:58:00 +01:00 |
|
Jonne Haß
|
d3f41a97c5
|
Merge pull request #4548 from diaspora/remove_acts_as_taggable_on_from_admin_panel
Remove acts as taggable on from admin panel
|
2013-12-01 14:48:02 -08:00 |
|
Jonne Haß
|
22cdd9d32c
|
Merge pull request #4611 from Gallaecio/gl
Updated the Galician (gl) translation.
|
2013-12-01 04:57:59 -08:00 |
|
Adrián Chaves Fernández (Gallaecio)
|
a590fbfc5f
|
Updated the Galician (gl) translation.
|
2013-12-01 12:16:26 +01:00 |
|
Jonne Haß
|
6c77df6ecb
|
Fix wrong pluralization key in en.yml
|
2013-11-30 15:44:43 +01:00 |
|
Jonne Haß
|
c4123e8146
|
Merge pull request #4603 from Flaburgan/fix-aspect-dropdown-contact-page
[Ready to review] Fix aspect dropdown on contacts page
|
2013-11-29 13:22:52 -08:00 |
|
flaburgan
|
748599a9dd
|
Refactor mobile publisher
|
2013-11-29 12:30:20 +01:00 |
|
Richard
|
dbbead1587
|
removed double comment
|
2013-11-28 21:48:41 +11:00 |
|
Richard
|
1b83b6942b
|
Merge branch 'develop' into feature/4509-image-upload-response-errors
|
2013-11-28 21:46:01 +11:00 |
|
Richard
|
ff07bddd1b
|
using status messages instead of popup and updated specs for publisher view.
|
2013-11-28 16:08:03 +11:00 |
|
Richard
|
3671f09b1d
|
checking file upload response error and giving an error alert if there is one.
|
2013-11-28 12:26:30 +11:00 |
|
flaburgan
|
7a50e79cfa
|
Fix aspect dropdown on contacts page
|
2013-11-27 13:07:31 -08:00 |
|
Fabian Rodriguez
|
e7ee7892ee
|
Add ActsAsTaggableOn::Tag to excluded models in rails_Admin
Fixes #4538
|
2013-11-24 11:51:39 -02:00 |
|
Fabian Rodriguez
|
5ed5b1f8ce
|
remove trailing whitespaces and indent rails_adimn initializer
|
2013-11-24 11:51:39 -02:00 |
|
Jonne Haß
|
05fa086caa
|
replace ugly 'followed by' grammar assumption at tags#show with proper version
|
2013-11-20 23:47:50 +01:00 |
|
Jonne Haß
|
478159f1cd
|
Merge pull request #4593 from Flaburgan/improve-mobile-design
Improve notifications and conversations views design on mobile
|
2013-11-20 12:05:28 -08:00 |
|
Fabian Rodriguez
|
d8618f8700
|
Merge pull request #4591 from Flaburgan/avatar-profile-mobile
Fix avatar display on mobile profile
|
2013-11-18 18:17:34 -08:00 |
|
flaburgan
|
e1fb8200dd
|
Move 'mark all as read' button under the title
|
2013-11-18 18:02:22 -08:00 |
|
flaburgan
|
85eb584e66
|
Remove useless :page_title indication from people/show
|
2013-11-16 15:40:03 -08:00 |
|
flaburgan
|
861b3d30f4
|
Fix tests
|
2013-11-16 13:48:33 -08:00 |
|
Fabian Rodriguez
|
b1590b73af
|
Merge pull request #4570 from Flaburgan/contacts-refactor
Add actions to contacts/index.html page
|
2013-11-16 12:27:39 -08:00 |
|
flaburgan
|
58886a6b30
|
Improve notifications and conversations views design
|
2013-11-16 03:06:25 -08:00 |
|
flaburgan
|
a02b0519c9
|
Fix "more picture" indication (+n) on mobile by adding a link on the indication
|
2013-11-16 02:06:45 -08:00 |
|
flaburgan
|
76b151eb7d
|
Fix avatar display on mobile profile
|
2013-11-16 01:57:37 -08:00 |
|
Raphael Sofaer
|
6ad083bf5b
|
Mark changelog to note fix for 4432
|
2013-11-15 15:07:09 -08:00 |
|
Raphael Sofaer
|
a07d3616a5
|
Add lightbox html to unauthenticated header
|
2013-11-15 14:33:46 -08:00 |
|
flaburgan
|
1833edfd67
|
Add actions to contacts/index.html page
|
2013-11-12 19:10:00 -08:00 |
|
Jonne Haß
|
859cd83e38
|
Merge pull request #4583 from Flaburgan/refactor-mobile-header
Refactor mobile header, close #4579
Conflicts:
Changelog.md
|
2013-11-10 23:55:55 +01:00 |
|
flaburgan
|
0f2773053e
|
refactor mobile header, close #4579
|
2013-11-09 23:21:32 -08:00 |
|
Fabian Rodriguez
|
7b861ecfac
|
Merge pull request #4582 from diaspora/fix_4534
getting started page mobile error 500. Fix #4534
|
2013-11-09 15:13:59 -08:00 |
|
movilla
|
1fcd675b3e
|
getting started page mobile error 500. Fix #4534
|
2013-11-09 19:25:32 -02:00 |
|
Fabian Rodriguez
|
146044bd36
|
Merge pull request #4578 from taratatach/force-comments-sort-order-in-mobile-spv
force comments sort order in mobile spv
|
2013-11-07 18:16:52 -08:00 |
|
Fabian Rodriguez
|
fdfe50b581
|
Merge pull request #4567 from Flaburgan/refactor-modify-aspect-facebox
Refactor modify aspect facebox
|
2013-11-07 17:53:43 -08:00 |
|
Erwan Guyader
|
0afdb134f8
|
force comments sort order in mobile spv
|
2013-11-07 17:19:23 -08:00 |
|
flaburgan
|
bee2c63762
|
Change icon when adding, fix #4568
|
2013-11-07 12:55:50 -08:00 |
|
flaburgan
|
3df0fdc09b
|
Improve the management of the contacts visibility settings in an aspect
|
2013-11-07 12:55:35 -08:00 |
|
Jonne Haß
|
3251fce3d6
|
Merge pull request #4580 from svbergerem/refactor-publisher
Refactor publisher css
|
2013-11-07 11:26:29 -08:00 |
|
Steffen van Bergerem
|
d5c3079623
|
refactor publisher css
|
2013-11-07 17:12:35 +01:00 |
|
Fabian Rodriguez
|
665f9735d9
|
Merge pull request #4569 from Flaburgan/reorder-menu
Put the stream first in the left menu
|
2013-11-04 17:50:26 -08:00 |
|
flaburgan
|
47645dd985
|
Put the stream first in the left menu
|
2013-11-04 17:46:45 -08:00 |
|
Jonne Haß
|
76c75af373
|
Merge pull request #4556 from Raven24/conversations
refactor conversation message creation
|
2013-10-21 03:46:57 -07:00 |
|