Jason Robinson
|
35ece9d65f
|
Instead of redirect on signup form validation, render new with submitted data.
|
2014-01-06 22:12:07 +02:00 |
|
Jonne Haß
|
867b0a7b79
|
Enable Ruby 1.9.3 on Travis
https://www.loomio.org/discussions/10519?proposal=6611
|
2014-01-06 11:54:16 +01:00 |
|
Jonne Haß
|
7c9460d5b0
|
Merge pull request #4667 from Flaburgan/fix-markdown-display
Fix markdown indication in the publisher when the user upload an image
|
2014-01-06 02:22:21 -08:00 |
|
Jonne Haß
|
7b5ea69d8a
|
Merge pull request #4668 from ZBarg/feature/remove-location-when-publisher-cleared
Fix: remove location when publisher is cleared by user
|
2014-01-06 02:16:50 -08:00 |
|
Damien Monet
|
b849d6c641
|
Fix: remove location when publisher is cleared by user
|
2014-01-05 11:09:03 +01:00 |
|
flaburgan
|
f758163f2e
|
Fix markdown indication in the publisher when the user upload an image
|
2014-01-04 15:58:20 +01:00 |
|
Florian Staudacher
|
9be0b075ac
|
add changelog entry for #4623 [ci skip]
|
2014-01-04 01:58:41 +01:00 |
|
Florian Staudacher
|
78d712b926
|
Merge pull request #4623 from Flaburgan/bump-selenium
Bump selenium, close #4621
|
2014-01-03 16:18:06 -08:00 |
|
flaburgan
|
3174310ba0
|
Bump selenium, close #4621
|
2014-01-03 23:12:26 +01:00 |
|
Jonne Haß
|
2734471feb
|
Merge pull request #4653 from svbergerem/3119-change-more-comments-link
Change more comments link
|
2014-01-02 01:14:33 -08:00 |
|
Florian Staudacher
|
d32bd8100a
|
Merge pull request #4644 from svbergerem/conversations-participants
Remove participants popover (- will be back in a different way)
|
2014-01-01 14:09:46 -08:00 |
|
Steffen van Bergerem
|
55b967caf9
|
remove participants popover + improve conversations menu
|
2014-01-01 21:58:56 +01:00 |
|
Fabian Rodriguez
|
54def634a7
|
Merge pull request #4648 from arlogn/4446-webkit-search-spinner-overlaps
4446 webkit search spinner overlaps
|
2014-01-01 09:15:53 -08:00 |
|
Steffen van Bergerem
|
ef128575ae
|
Change more comments link
|
2013-12-30 13:20:58 +01:00 |
|
arlogn
|
ae3b50080c
|
Fix spinner overlapping in webkit search box (#4446) and replace deprecated pseudo class :-moz-placeholder
|
2013-12-29 17:16:56 +01:00 |
|
Jonne Haß
|
5d83402dc3
|
Merge pull request #4628 from jaywink/4627-twitter-truncation-problem
Fix posting to Twitter by correctly catching over limit exception
|
2013-12-22 14:14:30 -08:00 |
|
Fabian Rodriguez
|
78c923de89
|
Merge pull request #4197 from MrZYX/bump_sidekiq
Update Sidekiq
|
2013-12-21 05:20:54 -08:00 |
|
Fabian Rodriguez
|
12ab9004c4
|
Merge pull request #4636 from MrZYX/bump_ruby
bump recommended ruby version to 2.0.0
|
2013-12-21 05:09:05 -08:00 |
|
Jonne Haß
|
4dcc712ea1
|
bump recommended ruby version to 2.0.0
|
2013-12-21 09:28:03 +01:00 |
|
Jonne Haß
|
b3ebe1a408
|
Merge pull request #4622 from svbergerem/improve-conversations-view
Improve conversations view, port to bootstrap
|
2013-12-16 12:55:48 +01:00 |
|
Steffen van Bergerem
|
a96611c259
|
use bootstrap labels
|
2013-12-16 00:46:55 +01:00 |
|
Steffen van Bergerem
|
206e3f9422
|
fix mobile
|
2013-12-15 23:40:08 +01:00 |
|
Jason Robinson
|
e665ebdab1
|
Fix posting to Twitter by correctly catching over limit exception (#4627). Also when doing a retry, make smaller cuts to max characters
|
2013-12-15 22:01:09 +02:00 |
|
Steffen van Bergerem
|
24310fe5a9
|
change layout
|
2013-12-15 20:14:55 +01:00 |
|
Steffen van Bergerem
|
5ab777f8cb
|
remove unused code
|
2013-12-15 18:01:32 +01:00 |
|
Steffen van Bergerem
|
c24cfb432d
|
fix facebox in conversations view
|
2013-12-15 14:20:47 +01:00 |
|
Steffen van Bergerem
|
c11b744a7f
|
port conversations view to bootstrap
|
2013-12-15 13:01:24 +01:00 |
|
flaburgan
|
c24d5193e4
|
Refactor conversations css + fix inconsistent height of conversations list bug
|
2013-12-15 01:15:44 +01:00 |
|
Jonne Haß
|
5c81da3147
|
Merge pull request #4625 from diaspora/fix_2645
fix #2645
|
2013-12-14 10:20:12 -08:00 |
|
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 |
|
Jonne Haß
|
a9e52528c1
|
bump sidekiq
|
2013-12-08 14:03:08 +01: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 |
|