Commits · 6fc6474e98cd55e21d62e0e12c06fd63d1652bcd · diasporg / diaspora

10 Mar, 2014 3 commits
- Refactor publisher · 6fc6474e
  Steffen van Bergerem authored Mar 01, 2014
  
  6fc6474e
- Use a button instead of input to submit, use smaller photos · 1b85d9d0
  Steffen van Bergerem authored Feb 25, 2014
  
  1b85d9d0
- port publisher and bookmarklet to bootstrap · 0cc3b10b
  Steffen van Bergerem authored Jan 09, 2014
  
  0cc3b10b
09 Mar, 2014 3 commits
- Merge pull request #4831 from MrZYX/fix_plaintext_mentions · 7fbf5081
  Florian Staudacher authored Mar 09, 2014
```
Fix plaintext mode for mentionable
```
  7fbf5081
- Fix plaintext mode for mentionable · bd24cb71
  Jonne Haß authored Mar 07, 2014
```
Also slight refactors to it.
```
  bd24cb71
- Merge pull request #4834 from Faldrian/atomfeedtohtml · 4fce6826
  Jonne Haß authored Mar 09, 2014
```
atom-feed content changed to html, use better post-title extractor
```
  4fce6826
08 Mar, 2014 2 commits

atom-feed content changed to html, use better post-title extractor · da0b3055

Faldrian authored Mar 08, 2014

Valid atom feed. Also these features are partially included:
- http://activitystrea.ms/specs/atom/1.0/#activity.verb
- http://portablecontacts.net/draft-spec.html#anchor16

da0b3055

Merge pull request #4827 from Flaburgan/fix-aspect-renaming · c3c2129e
Jonne Haß authored Mar 08, 2014
```
Fix aspect renaming after a regression caused by jquery upgrade
```
c3c2129e

05 Mar, 2014 1 commit
- Fix aspect renaming after a regression caused by jquery upgrade, close #4822 · 2c4dc830
  flaburgan authored Mar 05, 2014
  
  2c4dc830
03 Mar, 2014 2 commits
- Merge pull request #4823 from Flaburgan/fix-avatar-mobile-notification · f12546bb
  Jonne Haß authored Mar 04, 2014
```
Fix avatar position in mobile notification
```
  f12546bb
- Fix avatar position in mobile notification · 4cc8f1f7
  flaburgan authored Mar 03, 2014
  
  4cc8f1f7
27 Feb, 2014 1 commit
- Merge pull request #4805 from Flaburgan/refactor-mobile-css · d26ca746
  Jonne Haß authored Feb 27, 2014
```
Fix drawer in mobile version
```
  d26ca746
24 Feb, 2014 2 commits
- Fix drawer in some mobile browsers. · 67d71e22
  flaburgan authored Feb 24, 2014
```
Remove the black background on menu badges.
Fix body content on screen width > 768px.
Start split of mobile css in different files in /mobile/
```
  67d71e22
- Merge pull request #4681 from diaspora/upgrade_to_jquery_10 · a1c222dd
  Jonne Haß authored Feb 24, 2014
```
Upgrade to jquery 10
```
  a1c222dd
23 Feb, 2014 26 commits
- clear locale on each spec run, fix indentation · a2aff720
  Florian Staudacher authored Feb 23, 2014
  
  a2aff720
- cleanup 'getting started' cukes a bit · 1f98e1c6
  Florian Staudacher authored Feb 22, 2014
  
  1f98e1c6
- should fix remaining failing cukes from captcha and removal of client-side-validations gem · e2adaa07
  Florian Staudacher authored Feb 22, 2014
  
  e2adaa07
- captcha needs to be present, but can be bogus in test ENV · 061ae52e
  Florian Staudacher authored Feb 21, 2014
  
  061ae52e
- try to appease CI · dc1c1561
  Florian Staudacher authored Feb 18, 2014
  
  dc1c1561
- don't depend on the order of events (focus has two variants in jQuery) · b0502ef0
  Florian Staudacher authored Feb 18, 2014
  
  b0502ef0
- fix comment spec, jasmine should be ok now · 69a1718d
  Florian Staudacher authored Feb 18, 2014
  
  69a1718d
- fix likes spec · e3b22ed9
  Florian Staudacher authored Feb 17, 2014
  
  e3b22ed9
- fix search specs · b27edcb2
  Florian Staudacher authored Feb 16, 2014
  
  b27edcb2
- fix infinitescroll in contacts pages · 5aa86a5d
  Fabian Rodriguez authored Jan 12, 2014
  
  5aa86a5d
- add browser detection · f0ae80b8
  Fabian Rodriguez authored Jan 12, 2014
  
  f0ae80b8
- #toggle was removed · 97ede99c
  Fabian Rodriguez authored Jan 11, 2014
  
  97ede99c
- Removes client_side_validations · 4042e502
  Fabian Rodriguez authored Nov 18, 2013
```
Conflicts:
	Gemfile
	Gemfile.lock
```
  4042e502
- remove comment, for the record, it was an arbitrary number picked due to performance reasons · 1c09b75c
  Fabian Rodriguez authored Jan 06, 2014
  
  1c09b75c
- remove unused variable · 9fc70a03
  Fabian Rodriguez authored Jan 04, 2014
  
  9fc70a03
- remove aspect sorting logic · 8d8d3c64
  Fabian Rodriguez authored Jan 04, 2014
  
  8d8d3c64
- #live is no longer supported, use on instead · d3921f1f
  Fabian Rodriguez authored Jan 04, 2014
  
  d3921f1f
- remove require if jquery-ui-1.8.9.custom.min · cc9c6c78
  Fabian Rodriguez authored Jan 04, 2014
  
  cc9c6c78
- bump jquery-rails to 3.0.4 · 1fd156fd
  Fabian Rodriguez authored Jan 04, 2014
  
  1fd156fd
- removes unused and/or unnceseary js files: · 9c721293
  Fabian Rodriguez authored Jan 04, 2014
```
  *bootstrap-dropdown
  *bootstrap-modal
  *bootstrap-popover
  *bootstrap-transition
  *bootstratp-twipsy
  *jquery-ui-1.8.9.custom.min.js
if we need the bootstrap files we should include them via the gem bootstrap-sass
```
  9c721293
- Merge pull request #4809 from Gallaecio/gl · e5465728
  Jonne Haß authored Feb 23, 2014
```
Updated the Galician (gl) translation
```
  e5465728
- Updated the Galician (gl) translation · b37d0088
  Adrián Chaves Fernández (Gallaecio) authored Feb 23, 2014
  
  b37d0088
- Merge pull request #4787 from arlogn/new-wordpress-logo-icon · c3161943
  Jonne Haß authored Feb 23, 2014
```
New wordpress logo icon

Conflicts:
	app/assets/stylesheets/application.css.sass
```
  c3161943
- Merge pull request #4808 from vcuculo/fix-heart-icon · c03edd88
  Jonne Haß authored Feb 23, 2014
```
Fixed heart icon height in right sidebar
```
  c03edd88
- Fixed heart icon height in right sidebar · 96fc16f9
  vcuculo authored Feb 23, 2014
  
  96fc16f9
- Merge pull request #4802 from jaywink/devise_lastseenable · 0913f04c
  Jonne Haß authored Feb 23, 2014
```
Add devise_lastseenable for user last seen tracking.
```
  0913f04c