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

14191 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steffen van Bergerem
1b85d9d032 Use a button instead of input to submit, use smaller photos 2014-03-10 15:15:40 +01:00
Steffen van Bergerem
0cc3b10b1f port publisher and bookmarklet to bootstrap 2014-03-10 15:15:40 +01:00
Florian Staudacher
7fbf508165 Merge pull request #4831 from MrZYX/fix_plaintext_mentions 
Fix plaintext mode for mentionable
 2014-03-09 15:09:31 +01:00
Jonne Haß
bd24cb71a4 Fix plaintext mode for mentionable 
Also slight refactors to it.
 2014-03-09 14:02:15 +01:00
Jonne Haß
4fce682635 Merge pull request #4834 from Faldrian/atomfeedtohtml 
atom-feed content changed to html, use better post-title extractor
 2014-03-09 01:13:38 +01:00
Faldrian
da0b305514 atom-feed content changed to html, use better post-title extractor 
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
 2014-03-09 00:13:32 +01:00
Jonne Haß
c3c2129e95 Merge pull request #4827 from Flaburgan/fix-aspect-renaming 
Fix aspect renaming after a regression caused by jquery upgrade
 2014-03-08 12:49:52 +01:00
flaburgan
2c4dc830fc Fix aspect renaming after a regression caused by jquery upgrade, close #4822 2014-03-06 00:04:48 +01:00
Jonne Haß
f12546bb78 Merge pull request #4823 from Flaburgan/fix-avatar-mobile-notification 
Fix avatar position in mobile notification
 2014-03-04 00:41:44 +01:00
flaburgan
4cc8f1f76c Fix avatar position in mobile notification 2014-03-03 23:21:31 +01:00
Jonne Haß
d26ca74623 Merge pull request #4805 from Flaburgan/refactor-mobile-css 
Fix drawer in mobile version
 2014-02-27 13:13:31 +01:00
flaburgan
67d71e2280 Fix drawer in some mobile browsers. 
Remove the black background on menu badges.
Fix body content on screen width > 768px.
Start split of mobile css in different files in /mobile/
 2014-02-24 23:30:57 +01:00
Jonne Haß
a1c222dd23 Merge pull request #4681 from diaspora/upgrade_to_jquery_10 
Upgrade to jquery 10
 2014-02-24 10:29:08 +01:00
Florian Staudacher
a2aff720a2 clear locale on each spec run, fix indentation 2014-02-23 17:13:01 +01:00
Florian Staudacher
1f98e1c639 cleanup 'getting started' cukes a bit 2014-02-23 16:48:48 +01:00
Florian Staudacher
e2adaa07a2 should fix remaining failing cukes from captcha and removal of client-side-validations gem 2014-02-23 16:48:48 +01:00
Florian Staudacher
061ae52e4d captcha needs to be present, but can be bogus in test ENV 2014-02-23 16:48:48 +01:00
Florian Staudacher
dc1c156175 try to appease CI 2014-02-23 16:48:48 +01:00
Florian Staudacher
b0502ef07e don't depend on the order of events (focus has two variants in jQuery) 2014-02-23 16:48:48 +01:00
Florian Staudacher
69a1718d08 fix comment spec, jasmine should be ok now 2014-02-23 16:48:48 +01:00
Florian Staudacher
e3b22ed95c fix likes spec 2014-02-23 16:48:47 +01:00
Florian Staudacher
b27edcb2d1 fix search specs 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
5aa86a5def fix infinitescroll in contacts pages 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
f0ae80b82f add browser detection 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
97ede99c0f #toggle was removed 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
4042e50289 Removes client_side_validations 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
1c09b75cc2 remove comment, for the record, it was an arbitrary number picked due to performance reasons 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
9fc70a03a9 remove unused variable 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
8d8d3c649a remove aspect sorting logic 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
d3921f1f2b #live is no longer supported, use on instead 2014-02-23 16:48:46 +01:00
Fabian Rodriguez
cc9c6c780a remove require if jquery-ui-1.8.9.custom.min 2014-02-23 16:48:46 +01:00
Fabian Rodriguez
1fd156fd46 bump jquery-rails to 3.0.4 2014-02-23 16:48:46 +01:00
Fabian Rodriguez
9c7212934c removes unused and/or unnceseary js files: 
*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
 2014-02-23 16:48:46 +01:00
Jonne Haß
e5465728d7 Merge pull request #4809 from Gallaecio/gl 
Updated the Galician (gl) translation
 2014-02-23 16:21:30 +01:00
Adrián Chaves Fernández (Gallaecio)
b37d008849 Updated the Galician (gl) translation 2014-02-23 16:06:33 +01:00
Jonne Haß
c3161943f9 Merge pull request #4787 from arlogn/new-wordpress-logo-icon 
New wordpress logo icon

Conflicts:
	app/assets/stylesheets/application.css.sass
 2014-02-23 15:55:19 +01:00
Jonne Haß
c03edd8808 Merge pull request #4808 from vcuculo/fix-heart-icon 
Fixed heart icon height in right sidebar
 2014-02-23 15:50:59 +01:00
vcuculo
96fc16f9b5 Fixed heart icon height in right sidebar 2014-02-23 15:02:44 +01:00
Jonne Haß
0913f04c8d Merge pull request #4802 from jaywink/devise_lastseenable 
Add devise_lastseenable for user last seen tracking.
 2014-02-23 13:54:54 +01:00
Jason Robinson
5fe5507128 Add devise_lastseenable for user last seen tracking. 
Adds a timestamp to user model which is touched when user comes back. Statistics active users counts now use these more reliable timestamps. Fixes #4734
 2014-02-22 23:22:46 +02:00
Jason Robinson
f54931c813 Put #4799 changelog to correct place 2014-02-21 21:51:18 +02:00
Jason Robinson
ea82a91085 Merge pull request #4799 from JannikStreek/feature/4778-comment_counters 
Added count of comments to statistics
 2014-02-21 21:49:25 +02:00
Jason Robinson
d7748718f7 Merge pull request #4793 from Flaburgan/refactor-right-side-bar 
Refactor right side bar, see you, BRs.
 2014-02-21 20:27:02 +02:00
Jannik Streek
d603ff818c added comment count to statistic to calculate posts/comments ratios 
fixeds tests for comment count in statistics

added changelog entry and default entry
 2014-02-21 12:25:23 +01:00
Jason Robinson
b833d6d647 Merge pull request #4796 from Flaburgan/more-photos-than-8 
Remove the limit to 8 pictures in the view
 2014-02-21 13:24:41 +02:00
flaburgan
16309dc832 Remove the limit to 8 pictures in the view 2014-02-21 01:31:12 +01:00
Jonne Haß
e995491b92 Merge pull request #4797 from goobertron/capitalisation 
Update English locales to diaspora* instead of Diaspora.
 2014-02-20 21:09:44 +01:00
arlogn
d1aaf0acba new wordpress icons 2014-02-20 20:36:08 +01:00
goobertron
3c2b0a44d4 Update English locales to diaspora* instead of Diaspora. 2014-02-20 17:48:17 +00:00
flaburgan
a7c7e4b1e3 Refactor right side bar, see you, BRs. 2014-02-20 13:01:07 +01:00