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

14175 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jonne Haß
57991187d1 Merge branch 'hotfix/0.3.0.3' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-02-19 11:31:02 +01:00
Jonne Haß
1df3f546c9 update rails to 3.2.17 2014-02-19 11:09:06 +01:00
Jason Robinson
283e06bd26 Merge branch 'hotfix/0.3.0.2' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-02-18 22:13:52 +02:00
Jason Robinson
a8431430f0 Merge branch 'hotfix/0.3.0.2' 2014-02-18 22:10:09 +02:00
arlogn
659ee3ca82 align rightbar icon heart 2014-02-18 20:39:13 +01:00
Jason Robinson
2a15339f44 Bump version to 0.3.0.2 2014-02-15 17:04:48 +02:00
Jason Robinson
d6d97c17b0 Changelogs for 0.3.0.2, changelog for #4714 2014-02-15 17:04:18 +02:00
Steffen van Bergerem
ab9e7d8035 fix hovercards 
(cherry picked from commit a51c4f0ddc)

Conflicts:
	Changelog.md
 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
arlogn
405b9fd8b9 embedding youtube videos over https 
(cherry picked from commit 1563d088bc)
 2014-02-15 16:54:46 +02:00
Fabian Rodriguez
d65fc17223 bump kaminari 
(cherry picked from commit b5e6c2a149)
 2014-02-15 16:54:46 +02:00
Steffen van Bergerem
a51c4f0ddc fix hovercards 2014-02-15 14:09:03 +01:00
Jonne Haß
adf6c3c009 Merge pull request #4775 from dash-rai/move-mentions-input-plugin 
Moved jquery.mentionsInput plugin
 2014-02-10 21:12:12 +01:00
Darshan Rai
1f782dace9 Moved mentionsInput.js from vendor/assets to lib/assets 
The jquery.mentionsInput plugin upstream is no longer maintained.
 2014-02-10 23:19:50 +05:30
Darshan Rai
bc264bfa46 Issue #4767: Removed space that is inserted following the insertion of a mention 2014-02-10 22:21:35 +05:30
Jonne Haß
3ed4467155 Merge pull request #4765 from goobertron/jquery_source 
Update JQuery source to jquery.com

Conflicts:
	Changelog.md
 2014-02-10 17:02:09 +01:00