Steffen van Bergerem
ab9e7d8035
fix hovercards
...
(cherry picked from commit a51c4f0ddc
2014-02-15 16:58:12 +02:00
Florian Staudacher
d8dd727588
fix regression caused by updating backbone.js without updating changed parameters
...
(cherry picked from commit 09a840ea41
2014-02-15 16:54:46 +02:00
Florian Staudacher
0c5c17f5e2
fix regression in conversations causing an infinite recursion ( fix #4715 )
...
(cherry picked from commit 5c059b2925
2014-01-20 23:39:19 +02:00
Florian Staudacher
1924c40d38
replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem
...
- updates underscore to 1.5.2 and backbone to 1.1.0
backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
models
other changes:
- fix some events triggering multiple times in connection with deleting
a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
* no longer test the backbone router as part of our code
* jasmine factory already returns model instances, no need to wrap
that again
2014-01-16 23:23:30 +01:00
Dennis Schubert
6fc5ccb9f9
Merge pull request #4511 from MrZYX/bump_devise
...
update devise to 3.2
2014-01-15 13:17:48 -08:00
Jonne Haß
d97fd8089b
Merge pull request #4688 from ivanzotov/develop
...
Fix after_create to after_commit
2014-01-15 11:47:23 -08:00
Jonne Haß
15b1dae362
update devise to 3.2
2014-01-15 12:59:59 +01:00
Ivan Zotov
a4ce6e267a
Fix after_create to after_commit
2014-01-14 22:35:29 +04:00
Steffen van Bergerem
580068ed7c
Remove background from badges in header
2014-01-14 15:00:36 +01:00
goobertron
706b11b14d
Now with passing Cucumber tests
2014-01-13 18:14:43 +00:00
goobertron
a1ac848d62
Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting)
2014-01-12 20:02:33 +00:00
Jonne Haß
42f790fa13
Merge pull request #4666 from jaywink/signup-form-error-redirect
...
Instead of redirect on signup form validation, render new
2014-01-11 14:08:18 -08:00
Jonne Haß
7608319787
Merge pull request #4665 from svbergerem/fix-500-conversations
...
fix bug in conversations view causing server error
2014-01-08 23:55:09 -08:00
arlogn
31177e6bdb
bookmarklet publisher more usable mobile
2014-01-09 02:33:47 +01:00
Jonne Haß
ca9e2e24ea
Merge pull request #4670 from arlogn/bookmarklet-publisher-more-usable
...
bookmarklet publisher more usable
2014-01-07 11:29:50 -08:00
Jason Robinson
35ece9d65f
Instead of redirect on signup form validation, render new with submitted data.
2014-01-06 22:12:07 +02:00
Jason Robinson
db71c9c50b
Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$
2014-01-06 22:00:53 +02:00
maruf
c17a474142
Simple captcha for signup page
2014-01-06 22:00:37 +02: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
arlogn
61bfbc82e0
bookmarklet publisher more usable
2014-01-06 01:07:05 +01: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
Steffen van Bergerem
2e50a16567
fix bug in conversations view causing server error
2014-01-04 01:54:45 +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
Steffen van Bergerem
55b967caf9
remove participants popover + improve conversations menu
2014-01-01 21:58:56 +01: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
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
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
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
80015e7ba8
move everything under post-viewer/ to single-post-viewer/
2013-12-08 12:36:01 -02: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
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
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ß
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
