Jonne Haß
|
6feb7969a3
|
bump mime-types
|
2013-04-15 01:36:48 +02:00 |
|
Jonne Haß
|
63732d8722
|
bump rake
|
2013-04-15 01:36:48 +02:00 |
|
Jonne Haß
|
d136fd56e7
|
bump guard
|
2013-04-15 01:36:48 +02:00 |
|
Jonne Haß
|
dacaaca7e5
|
bump chunky_png
|
2013-04-15 01:36:48 +02:00 |
|
Jonne Haß
|
bef8b1ea3c
|
Fix typo in devise initializer
|
2013-04-15 02:35:53 +03:00 |
|
Jonne Haß
|
5607a71458
|
Merge pull request #4116 from Raven24/remove-capistrano
remove capistrano from the main source code repo
|
2013-04-14 15:55:23 -07:00 |
|
Florian Staudacher
|
f3aa802a0d
|
remove capistrano from the main source code repo
capistrano deployment scripts will be maintained in a separate deployment repo
|
2013-04-15 00:50:23 +02:00 |
|
Jonne Haß
|
19206fb67d
|
Merge pull request #4115 from movilla/small_fix
Correction typos for changelog and activity mobile feature
|
2013-04-13 13:32:20 -07:00 |
|
movilla
|
c1479b36ca
|
Correction typos for changelog and activity mobile feature
|
2013-04-13 22:24:07 +02:00 |
|
Jonne Haß
|
3572ae8d2e
|
Merge branch 'remove_navbar' of git://github.com/movilla/diaspora into movilla-remove_navbar
Conflicts:
Changelog.md
|
2013-04-13 13:04:52 +02:00 |
|
Jonne Haß
|
fd069af2c6
|
Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more
Conflicts:
Changelog.md
|
2013-04-13 12:53:31 +02:00 |
|
Jonne Haß
|
7a0d1c647a
|
Merge pull request #4096 from RoonyH/3897-submit_a_comment_by_shift+enter
3897 submit a comment by shift+enter
|
2013-04-13 03:49:40 -07:00 |
|
Jonne Haß
|
ac7bccfe4c
|
bump sidekiq
|
2013-04-13 11:27:26 +02:00 |
|
Jonne Haß
|
bef05c14d7
|
Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop
Conflicts:
Changelog.md
|
2013-04-10 18:24:47 +02:00 |
|
Jonne Haß
|
15418eae67
|
Merge pull request #4112 from marpo60/issues_4017_4107_fixes
close issues #4017 and 4107 by including jquery.textchange
|
2013-04-10 07:58:30 -07:00 |
|
Juan Manuel Azambuja
|
01d91e02d4
|
Add changelog entry for #4017 & #4107
|
2013-04-10 11:17:40 -03:00 |
|
Jonne Haß
|
f272c7ed03
|
Merge branch 'brauliomartinezlm-4058_redirect_to_downcase_version_of_tags' into develop
|
2013-04-10 10:20:18 +02:00 |
|
Braulio Martinez
|
c651cbab78
|
Always redirect user to downcase version of tags on UTF-8 encoding
|
2013-04-10 00:08:58 -03:00 |
|
Juan Manuel Azambuja
|
5a85fd71f1
|
close issues #4017 and 4107 by including jquery.textchange
|
2013-04-09 16:21:19 -03:00 |
|
Diaspora Europe
|
783d98745a
|
added to admin section: which users are under the age of 13 #1283
|
2013-04-08 16:50:33 +02:00 |
|
Aruna Herath
|
b0879dd256
|
added same feature to publisher
|
2013-04-08 19:29:36 +05:30 |
|
Aruna Herath
|
5f6ce87a23
|
added shift+enter key from new comment box to submit the comment.
|
2013-04-08 19:08:29 +05:30 |
|
movilla
|
bc87b501f2
|
Fix show more post in my activity mobile page. Close #4108
|
2013-04-08 00:04:42 +02:00 |
|
Florian Staudacher
|
06d67bf854
|
Merge pull request #4099 from svbergerem/feature/post-preview
Preview posts in stream
|
2013-04-07 11:38:11 -07:00 |
|
Steffen van Bergerem
|
6e724fc1d4
|
preview posts in stream
|
2013-04-07 17:43:27 +02:00 |
|
Jonne Haß
|
0ca40d0abc
|
ignore warning about .ruby-version
|
2013-04-07 11:13:58 +02:00 |
|
Jonne Haß
|
65ce91bbd1
|
Merge pull request #4106 from jaywink/4057-bookmarklet-post-cannot-be-edited
Include missing javascript in bookmarklet to fix uneditable post content
|
2013-04-06 14:41:34 -07:00 |
|
Jason Robinson
|
9c0c5a7258
|
Include missing javascript in bookmarklet, regression introduced in commit ffc6c1102e. Fixes #4057
|
2013-04-07 00:06:02 +03:00 |
|
Jonne Haß
|
6fae984e5a
|
Merge pull request #4101 from brunomachado/feature/3796-convert-stylesheets-to-scss
Convert some stylesheets to SCSS
|
2013-04-06 12:52:08 -07:00 |
|
Bruno Machado
|
1e50d1465a
|
Convert some stylesheets to SCSS #3796
|
2013-04-06 15:34:15 -03:00 |
|
Jonne Haß
|
0149dbf9ad
|
Merge pull request #4102 from movilla/fixed_navbar
Mobile buttons are only clickable when scrolled to the top. Close #3847
|
2013-04-05 11:25:38 -07:00 |
|
movilla
|
33ecc50fbc
|
Mobile buttons are only clickable when scrolled to the top
|
2013-04-05 19:16:15 +02:00 |
|
Jonne Haß
|
0f05506f8d
|
Merge pull request #4098 from embs/feature/3795-fix-default-profiles-image-url
Fix default image url in profiles table. Closes #3795
|
2013-04-04 15:54:15 -07:00 |
|
embs
|
16cf699d4b
|
Fix default image url in profiles table. Closes #3795
|
2013-04-04 19:22:43 -03:00 |
|
Jonne Haß
|
be470784c5
|
add app directory to the autoload paths so that the worker files are loaded in development mode too
|
2013-04-04 23:32:11 +02:00 |
|
Florian Staudacher
|
19f94fb169
|
Merge pull request #4095 from embs/feature/3064-add-services-explanation
Add explanation to services index page. Closes #3064
|
2013-04-04 12:38:50 -07:00 |
|
embs
|
4ef37c64be
|
Add explanation to services index page. Closes #3064
|
2013-04-04 15:51:11 -03:00 |
|
Jonne Haß
|
92a2a9189d
|
bump sidekiq and cleanup unicorn.rb
|
2013-04-04 20:42:41 +02:00 |
|
Dennis Schubert
|
3b7bb2c44e
|
Fix the tag number in sidekiq's changelog notes
... it's been a while ...
|
2013-04-04 12:22:50 +03:00 |
|
Dennis Schubert
|
f3b7d57b3a
|
Merge pull request #3993 from MrZYX/sidekiq
Sidekiq (+ some cleanup)
|
2013-04-03 15:19:15 -07:00 |
|
Florian Staudacher
|
f08f4a22f7
|
Merge pull request #4089 from svbergerem/feature/add-hotkeys
added hotkeys to navigate in stream
|
2013-04-02 13:11:06 -07:00 |
|
Steffen van Bergerem
|
a693a0970b
|
added hotkeys to navigate in stream
|
2013-04-02 19:24:20 +02:00 |
|
Jonne Haß
|
85ae8e2ac5
|
Merge pull request #4091 from instrumentio/feature/rubygems-2
ensure v2 release of rubygems
|
2013-04-02 10:10:17 -07:00 |
|
Alexander Wenzowski
|
a2e9711c76
|
bundler version should not be a hard dependency per #4091
|
2013-04-02 12:29:18 -04:00 |
|
Alexander Wenzowski
|
5b0d33ade0
|
ensure v2 release of rubygems
|
2013-04-01 22:17:25 -04:00 |
|
Jonne Haß
|
4c5a298304
|
Merge pull request #4088 from brunomachado/feature/2940-remove-borders
Remove unnecessary dotted CSS borders
|
2013-04-01 12:39:20 -07:00 |
|
Bruno Machado
|
29af94ce4e
|
Remove unnecessary dotted CSS borders. Closes #2940
|
2013-04-01 15:53:27 -03:00 |
|
Jonne Haß
|
704113f896
|
replace remaining Postzord::Dispatcher.build(self, profile).post with call to the new method
|
2013-03-31 16:52:18 +02:00 |
|
movilla
|
8375433788
|
* Remove unnecessary navigation bar to access mobile site
* Re-add flash warning to registrations mobile
* Remove excess :css
* Fix littles css errors
|
2013-03-30 23:09:45 +01:00 |
|
Tom Scott
|
74690088f2
|
Update changelog. Apologize for idiocy.
|
2013-03-30 09:33:42 -04:00 |
|