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

15184 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Kiesel
e2e502ea68 Show error message on invalid reset password attempt 2014-10-11 10:47:00 +13:00
Steffen van Bergerem
715f451ed4 only collapse empty comment box 2014-10-10 20:05:28 +02:00
James Kiesel
1400228757 Fix missing password translations 2014-10-11 00:41:52 +13:00
Steffen van Bergerem
a12ca511c3 Convert close mentioned account cuke 2014-10-10 03:49:56 +02:00
Steffen van Bergerem
226f1bbfc3 Convert activity stream cuke 2014-10-10 03:49:56 +02:00
Steffen van Bergerem
2b72fd0f35 Remove tests for removed beta code 2014-10-10 03:49:56 +02:00
Steffen van Bergerem
823316d7f7 Convert tag cukes to rspec tests 2014-10-10 03:49:41 +02:00
Steffen van Bergerem
8ca5ca7c92 Reshare the absolute root of a post 2014-10-10 03:12:07 +02:00
James Kiesel
206ec99f8f Strip search query of leading & trailing whitespace 2014-10-09 23:34:11 +13:00
James Kiesel
2d44107b5d Allow nil HTTP user agent 2014-10-09 23:08:33 +13:00
Steffen van Bergerem
d44300c7a2 Merge pull request #5301 from Flaburgan/fix-new-profile 
Remove one border-bottom on the photo page
 2014-10-09 10:21:46 +02:00
flaburgan
476f694bca Remove one border-bottom on the photo page 2014-10-08 19:40:06 +02:00
Jonne Haß
cf6b144712 Merge pull request #5310 from strivedi183/5194-replace_jqueryidletimerjs_vendored_asset_with_bower_package 
Replaced jquery.idle-timer.js vendored asset with bower package
 2014-10-08 10:47:18 +02:00
Sandip Trivedi
fce957443e Update jquery.idle-timer.js from 0.9.3 to 1.0.1 #5194 2014-10-08 00:10:42 -04:00
Sandip Trivedi
215fc1c96b Replaced jquery.idle-timer.js vendored asset with a bower package #5194 2014-10-08 00:00:14 -04:00
flaburgan
adc839d620 Add network key to statistics.json, close #5042 2014-10-08 01:16:54 +02:00
Steffen van Bergerem
4cfe3d7005 Merge pull request #5271 from polsVoice/feature/4901-hoverable-left-menu 
Feature/4901 hoverable left menu
 2014-10-07 22:21:05 +02:00
Jonne Haß
518186a538 Merge pull request #5299 from strivedi183/5194-replace_jqueryplaceholderjs_vendored_asset_with_bower_package 
Replaced jquery.placeholder.js vendored asset with bower package and updated to latest version #5194
 2014-10-07 14:40:47 +02:00
Jonne Haß
ea2a1f0ec9 Merge pull request #5304 from svbergerem/new-profile-fix-regressions 
Fix pagination for people/guid/contacts
 2014-10-07 14:37:14 +02:00
Steffen van Bergerem
d04cf7046b Fix pagination for people/guid/contacts 2014-10-07 10:55:58 +02:00
Sandip Trivedi
eb916f2690 Update jquery.placeholder.js from 1.8.7 to 2.0.8 #5194 2014-10-07 00:56:37 -04:00
Sandip Trivedi
2af32220a5 Replaced jquery.placeholder.js vendored asset with a bower package #5194 2014-10-07 00:46:24 -04:00
Jonne Haß
803c257ecf Merge pull request #5297 from strivedi183/5194-replace_jquerytextchangejs_vendored_asset_with_bower_package 
Replaced jquery.textchange.js vendored asset with a bower package #5194
 2014-10-07 02:43:06 +02:00
Sandip Trivedi
d7e8e2ce2c Replaced jquery.textchange.js vendored asset with a bower package #5194 2014-10-06 18:54:50 -04:00
Jonne Haß
86ce99418f Merge pull request #5293 from Flaburgan/fix-new-profile 
Add a small margin to reshares in bootstrap streams
 2014-10-06 22:17:22 +02:00
jaideng123
bd24d6bebe Added cucumber test for notifications dropdown 2014-10-06 13:55:46 -05:00
flaburgan
82a8673a36 Add margin to reshare 2014-10-06 20:00:07 +02:00
Florian Staudacher
4f87a47d0a Merge pull request #4657 from svbergerem/bootstrap-people-view 
Redesign profile page and port to Bootstrap
 2014-10-06 15:09:08 +02:00
Roy McKenzie
1df8f0cf20 Added classes to the body for easier page specific styling. 2014-10-04 17:58:39 -07:00
Alex Nordlund
acc7377e5f Removed setting for statistics, showing both instead. 2014-10-05 01:45:48 +02:00
Alex Nordlund
03f3c74cee Moved services to a JSON list. 
Added AppConfig.privacy.statistics.deprecated_format to toggle showing the old style format.
 2014-10-05 01:07:30 +02:00
Steffen van Bergerem
65e9e1c744 Hidden overflow for long names on tag pages 2014-10-04 22:58:57 +02:00
Jonne Haß
eac3f042a4 Reset dynamic configuration after each example in the testsuite 2014-10-04 00:59:03 +02:00
Jonne Haß
7d656d32de Merge pull request #5256 from jaywink/fix-services-statistics 
Fix services in statistics.json.
 2014-10-04 00:44:36 +02:00
Jonne Haß
66c2f7f869 Fix statistics_presenter_spec 2014-10-04 01:01:19 +03:00
Jason Robinson
309e690a66 Fix services in statistics.json. 
Currently there is a bug in configurate that reports incorrectly the services settings if they are set as ENV variables, instead of diaspora.yml settings.
This commit works around that issue by changing the way the setting is fetched.
 2014-10-03 23:54:42 +03:00
Jonne Haß
1959f0d939 Merge branch 'hotfix/0.4.1.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-10-03 17:14:55 +02:00
Jonne Haß
19133975f1 Merge branch 'hotfix/0.4.1.1' 2014-10-03 17:13:27 +02:00
Jonne Haß
a5ca738e91 Fix XSS issue in poll questions 
closes #5274
 2014-10-03 17:12:11 +02:00
Brent Bartlett
f9564af0ba moved hoverable class from <li> to <a> 2014-10-02 17:02:15 -07:00
Jonne Haß
648a45b4d6 Merge pull request #5265 from theatre-x/patch-6 
Fixed typo
 2014-10-01 13:02:01 +02:00
Brandon
805e476c34 Fixed typo 
From "Seams" to "Seems"
 2014-10-01 06:41:25 -04:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
Jonne Haß
0e1bac59f7 Merge pull request #5263 from strivedi183/5194-replace_punycodejs_vendored_asset_with_bower_package 
Replaced punycode.js vendored asset with a bower package #5194
 2014-10-01 12:23:00 +02:00
Sandip Trivedi
10feffada4 Replaced punycode.js vendored asset with a bower package #5194 2014-09-30 16:16:52 -04:00
jaideng123
2b6ac9261b Notifications Dropdown now infinite scrolls 2014-09-29 16:30:36 -05:00
Jonne Haß
4a87e7d72e bump acts-as-taggable-on, closes #5228, #5234 2014-09-29 16:10:51 +02:00
Jonne Haß
baacefbd92 look for hashed version of default.css in script/server 
fixes #5254
 2014-09-28 16:37:29 +02:00
Florian Staudacher
c7b4b77ce8 Merge pull request #5209 from jhass/federation_improvements 
Federation improvements
 2014-09-27 16:18:37 +02:00
Jonne Haß
430d5bd2e9 bump configurate 2014-09-26 22:14:09 +02:00