nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14027 commits 4 branches 0 tags 121 MiB
Commit graph

446 commits

Author SHA1 Message Date
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
Steffen van Bergerem
580068ed7c Remove background from badges in header 2014-01-14 15:00:36 +01: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
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
Damien Monet
b849d6c641 Fix: remove location when publisher is cleared by user 2014-01-05 11:09:03 +01:00
Florian Staudacher
9be0b075ac add changelog entry for #4623 [ci skip] 2014-01-04 01:58:41 +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
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
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
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
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
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
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
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
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
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ß
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ß
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
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
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
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
Erwan Guyader
0afdb134f8 force comments sort order in mobile spv 2013-11-07 17:19:23 -08:00
flaburgan
3df0fdc09b Improve the management of the contacts visibility settings in an aspect 2013-11-07 12:55:35 -08:00
flaburgan
47645dd985 Put the stream first in the left menu 2013-11-04 17:46:45 -08:00
Florian Staudacher
1c4ad0986c refactor message creation (conversations) 2013-10-20 22:46:53 +02:00
Florian Staudacher
830747a11e refactor conversations_controller#create 2013-10-10 21:42:46 +02:00
Jonne Haß
eea9467846 refactor twitter service model 2013-09-30 10:13:14 +02:00
Florian Staudacher
260d86d501 refactor ConversationsController, move query builing to User model 2013-09-30 01:44:57 +02:00
Florian Staudacher
e614562470 avoid publishing empty posts (fixes #4401) 
invalidate empty posts when created by a local user

add changelog entry
 2013-09-24 21:57:22 +02:00
flaburgan
02ef9e08f6 Remove the (now useless) last post link from the user profile. 2013-09-20 17:37:34 -07:00
Fabian Rodriguez
abc06686ce Merge pull request #4523 from Flaburgan:improve-getting-started 
Conflicts:
	Changelog.md
 2013-09-19 19:37:54 -03:00
Jonne Haß
68da48f0d6 Merge pull request #4079 from Flaburgan/patch-3 
Fix #4078 by refactoring 404.html
 2013-09-19 14:34:34 -07:00
Jonne Haß
ac13e79225 Merge pull request #4529 from Flaburgan/fix-timeago-color 
Change .timeago color and align notification, fix #4502
 2013-09-19 23:32:32 +02:00
Jonne Haß
e6be888707 Merge pull request #4522 from fubik/transparent_background 
Add a white background to images displayed in the lightbox

Conflicts:
	Changelog.md
 2013-09-19 23:27:57 +02:00
PallaviTS
5caa46cc83 fixing commenting 
Added jamisne tests for comments

Added 2 jasmine tests for fixing commenting

Bugfix: #4005 added changelog entry
 2013-09-19 23:22:48 +02:00