Fabian Rodriguez
|
c12a45556d
|
fix #2645
* refactor a bit #weekly_user_stats
* pass 0 instead of "" to i18n
* use the first week if none is provided
|
2013-12-13 19:32:04 -02:00 |
|
Fabian Rodriguez
|
bbbdd87519
|
Merge pull request #4589 from Flaburgan/add-markdown-indication-publisher
[Ready to review] Add indication about markdown formatting in the publisher
|
2013-12-13 13:25:23 -08:00 |
|
flaburgan
|
6aced29bb6
|
Add expand the publisher test
|
2013-12-13 17:55:33 +01:00 |
|
flaburgan
|
923a4f2ab4
|
Add indication about markdown formatting in the publisher
|
2013-12-13 16:02:39 +01:00 |
|
Jonne Haß
|
c660c90091
|
Merge pull request #4612 from diaspora/drop_spv_old_code
Drop spv old code
|
2013-12-11 07:41:51 -08:00 |
|
Fabian Rodriguez
|
4adb460c51
|
add changelog entry
|
2013-12-10 18:50:30 -02:00 |
|
Jonne Haß
|
4fb6da2edc
|
Merge pull request #4619 from jaywink/statistics-clarification-changelog
Add mention in changelog about statistics route
|
2013-12-08 13:36:51 -08:00 |
|
Jason Robinson
|
4d3c48607a
|
Add mention in changelog about statistics route, relating to already closed and merged #4602
|
2013-12-08 22:10:20 +02:00 |
|
Jonne Haß
|
69a1270535
|
Merge pull request #4618 from svbergerem/fix-typo-lightbox-spec
fix typo in lightbox spec
|
2013-12-08 07:03:58 -08:00 |
|
Fabian Rodriguez
|
80015e7ba8
|
move everything under post-viewer/ to single-post-viewer/
|
2013-12-08 12:36:01 -02:00 |
|
Steffen van Bergerem
|
db382f6929
|
fix typo in lightbox spec
|
2013-12-08 15:02:41 +01:00 |
|
Fabian Rodriguez
|
8cf4e4a7fb
|
remove old templates
|
2013-12-08 11:39:36 -02:00 |
|
Fabian Rodriguez
|
933c3b01ca
|
remove old styles
|
2013-12-07 12:03:26 -02:00 |
|
Fabian Rodriguez
|
f3f8d36b9d
|
remove wallpaper-mood template
|
2013-12-06 20:07:37 -02:00 |
|
Fabian Rodriguez
|
d700c66deb
|
remove useless specs
|
2013-12-06 20:07:35 -02:00 |
|
Fabian Rodriguez
|
2b8c8a58ee
|
fix i18n fallback after i18n update
|
2013-12-05 11:35:13 -02:00 |
|
Fabian Rodriguez
|
c339090f6e
|
Merge branch 'release/0.2.0.1' into develop
Conflicts:
Changelog.md
config/defaults.yml
|
2013-12-05 09:11:41 -02:00 |
|
Fabian Rodriguez
|
299e02c60b
|
bump to 0.2.0.1
|
2013-12-05 08:50:49 -02:00 |
|
Jonne Haß
|
22067349ce
|
Merge pull request #4617 from jaywink/fix-gitignore-paths
Fix path ignores in .gitignore
|
2013-12-05 01:13:59 -08:00 |
|
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 |
|
Fabian Rodriguez
|
740c0bc082
|
bump Rails to version 3.2.16
|
2013-12-04 21:36:54 -02:00 |
|
Fabian Rodriguez
|
90b0cc51a0
|
bump recommended Ruby version 1.9.3-p484
|
2013-12-04 21:04:25 -02:00 |
|
Fabian Rodriguez
|
ea58324aa8
|
remove template picker
|
2013-12-04 20:08:54 -02:00 |
|
Fabian Rodriguez
|
6c8c4fc99e
|
remove template picker functionality
|
2013-12-03 20:53:00 -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 |
|
Fabian Rodriguez
|
cfc247db75
|
remove PostViewerFeedback
|
2013-12-01 20:55:49 -02:00 |
|
Fabian Rodriguez
|
9be780468d
|
remove PostViewerInteractions
|
2013-12-01 20:55:49 -02:00 |
|
Fabian Rodriguez
|
bf3ee8d7bb
|
remove PostViewer
|
2013-12-01 20:55:48 -02:00 |
|
Fabian Rodriguez
|
179cc9e8dd
|
remove PostViewerAuthor
|
2013-12-01 20:55:48 -02:00 |
|
Fabian Rodriguez
|
0702db137a
|
remove PostViewerNav
|
2013-12-01 20:55:48 -02:00 |
|
Fabian Rodriguez
|
d7b8cb2997
|
remove #next_post_path and #previous_post_path from postpresenter
|
2013-12-01 20:55:48 -02:00 |
|
Fabian Rodriguez
|
92db8cb929
|
remove #next and #previous from posts_controller
|
2013-12-01 20:55:48 -02:00 |
|
Fabian Rodriguez
|
6eed63807d
|
remove next and previous functionality from router
|
2013-12-01 20:55:48 -02: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 |
|