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

3596 commits

Author SHA1 Message Date
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
Jonne Haß
eac3f042a4 Reset dynamic configuration after each example in the testsuite 2014-10-04 00:59:03 +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ß
a5ca738e91 Fix XSS issue in poll questions 
closes #5274
 2014-10-03 17:12:11 +02:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +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ß
d6f5368474 Handle already deleted photos gracefully in process photo job 2014-09-20 15:13:14 +02:00
Jonne Haß
499ff6e0f4 Fix receiving a relayable retraction through the public route 2014-09-20 15:03:53 +02:00
Jonne Haß
5ca1c1d295 Raise on 404 during Webfinger 
That's at least readable, return false just causes
silly follow up errors
 2014-09-20 13:47:52 +02:00
Jonne Haß
4b754b51f9 Discard dispatch jobs of already deleted records 2014-09-20 13:39:31 +02:00
Jonne Haß
5133458d30 Start converting IDN emails 2014-09-20 04:05:57 +02:00
Jonne Haß
7da6501602 let tags controller spec generate offending query for #5228 2014-09-18 12:39:16 +02:00
Florian Staudacher
6e1bd7216d fix /u/[username] route 2014-09-18 00:23:43 +02:00
Florian Staudacher
a5da2ca48c small fixes and more jasmine specs 2014-09-15 01:37:24 +02:00
Florian Staudacher
10609c3692 fix jasmine and add some specs for direction detection 2014-09-15 01:37:23 +02:00
Florian Staudacher
be86014540 rspec should now be running a green build 2014-09-15 01:37:23 +02:00
Florian Staudacher
89d468cdcc first round of specs and code cleanups/fixes 2014-09-15 01:37:23 +02:00
jaideng123
d16eabae21 Added test for truncation to gather OG data spec 2014-09-07 20:28:02 -05:00
Jonne Haß
619bc3f537 A reshares root may be already gone when generating the notification 2014-09-07 10:47:47 +02:00
Jonne Haß
777e3123d6 Try fetching missing parent of relayables 
* Extract post fetching logic from Reshare into
  its own module
* raise proper error message when fetching fails
* raise proper error message when parent is still missing

We can't skip fetch failures or missing parents and
still need to retry them in case we're sent the parent
later on
 2014-09-07 10:47:47 +02:00
Jonne Haß
9c88fde821 Switch Faraday adapter to typhoeus 
It uses curl which has less problems connecting
to a missconfigured IPv6 host (falls back to v4)
 2014-09-07 10:47:47 +02:00
Jonne Haß
01e0127287 Ignore embedded photos if invalid 
For example if they're already present
Also refactor StatusMessage XML specs
 2014-09-06 04:52:18 +02:00
Steffen van Bergerem
ba0bccbef1 Redirect conversations/new to conversations 2014-09-01 17:11:56 +02:00
Jonne Haß
99de61fdfa Merge branch 'release/0.4.1.0' into develop 2014-08-30 22:15:56 +02:00
Jonne Haß
6df79f6983 so turns out whether an id is serialized to a json integer or string 
depends on the DB backend
 2014-08-30 22:15:05 +02:00
Jonne Haß
1515848120 Merge branch 'release/0.4.1.0' into develop 
Conflicts:
	app/controllers/conversations_controller.rb
	spec/controllers/conversations_controller_spec.rb
 2014-08-30 20:09:08 +02:00
Jonne Haß
5d549f553b Escape person name in contacts json 
jQuery autoSuggest uses .html to insert it into the DOM
 2014-08-30 20:06:03 +02:00
Jonne Haß
79e1a9aafd port notify local users worker spec to doubles 2014-08-29 01:42:16 +02:00
Steffen van Bergerem
3f3087c77f Port tags page to Bootstrap 2014-08-28 18:02:02 +02:00
Jonne Haß
ccd7c670b3 Merge pull request #5170 from khall/issue_5149a 
Issue 5149a

Conflicts:
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
 2014-08-27 18:20:56 +02:00
Jonne Haß
f1ab434b18 Merge pull request #5153 from svbergerem/redesign-contacts-page 
Redesign contacts page
 2014-08-27 10:01:41 +02:00
khall
fe492c6fb8 Fixing a .should test to expect(), adding suggested line to spec_helper to prevent the use of .should in the future 2014-08-26 17:39:13 -07:00
khall
b7c68031fa Last rspec fix brought to you by jhass 2014-08-26 17:12:58 -07:00
khall
c27b38d69a Merge branch 'develop' into issue_5149 
Conflicts:
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/conversations_controller_spec.rb
	spec/controllers/people_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/integration/receiving_spec.rb
	spec/lib/postzord/receiver/public_spec.rb
	spec/models/post_spec.rb
	spec/models/user/querying_spec.rb
 2014-08-26 17:11:39 -07:00
khall
4edd824d3c No deprecation warnings, but one spec still fails (but only when I run all the specs, not when I run just the one spec) 2014-08-26 17:10:29 -07:00
khall
c42916df27 Two tests failing after rspec 2.99 => 3.0.0 2014-08-26 17:10:26 -07:00
khall
027bb9fcb0 Rspec version bump to 2.99 2014-08-26 17:00:21 -07:00
Flaburgan
2151b4f791 Add jasmine tests 2014-08-27 00:03:49 +02:00
Steffen van Bergerem
ff84ee0485 Small style changes, add tests 2014-08-26 22:45:43 +02:00
Jonne Haß
f772af86a6 Merge pull request #5156 from khall/issue_5040 
Fix for issue 5040
 2014-08-26 01:16:41 +02:00
Jonne Haß
ac998407b5 bump jasmine-core 2014-08-25 19:16:55 +02:00
Jonne Haß
42b08e8ab8 Update to Rails 4.1 2014-08-25 17:37:02 +02:00
khall
6d3528c539 Fix for issue 5040: Adds completed_at column to account_deletions and sets timestamp upon successful completion. Depends on uniqueness of diaspora_handle when combined with person_id 2014-08-24 17:06:33 -07:00
Jonne Haß
2619beb157 Merge pull request #4481 from diaspora/rails4 
Port to Rails 4
 2014-08-24 13:42:31 +02:00
Steffen van Bergerem
c18df1c32f Change mark read link on notifications page 2014-08-23 17:42:19 +02:00
Jonne Haß
d070f19243 make rspec and jasmine pass with the new code 2014-08-23 16:47:57 +02:00
Florian Staudacher
b07f6cf1db adapt rebased changes to jasmine 2 2014-08-23 16:47:48 +02:00
Florian Staudacher
037671f1b6 port remaining specs - jasmine is green again (non-CI) 2014-08-23 16:46:08 +02:00