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

1170 commits

Author SHA1 Message Date
Jonne Haß
987281270a bump ruby-oembed 2015-02-28 02:36:13 +01:00
Jonne Haß
9530f00bd6 Don't use a too large invalid id 2015-02-27 16:58:39 +01:00
Jonne Haß
ed44689670 Fix a spec for LikesController 2015-02-27 16:36:45 +01:00
Jonne Haß
93c9ad6eba Fix participations controller spec 2015-02-27 16:27:55 +01:00
Jonne Haß
be1ab6c6a3 Merge branch 'collimarco-issue5350' into develop 2015-02-27 15:33:55 +01:00
Akash Agrawall
3bb5e78893 Lock account #5564 2015-02-19 05:45:04 +05:30
Steffen van Bergerem
eb7e2eac9d Update jasmine-ajax 2015-02-17 04:03:42 +01:00
Lukas Matt
a475d5fb62 Add the ability to link to remote user profile 
related to diaspora/jsxc#77
 2015-02-13 19:23:26 +01:00
Steffen van Bergerem
8962d75eb7 Conversations: fix badge count and automatic scrolling 2015-02-10 19:11:20 +01:00
Steffen van Bergerem
c1d714d2c7 Remove unused files, fix syntax in jasmine tests 2015-02-07 21:17:51 +01:00
Marco Colli
eccab62e32 Allow user to enable / disable notifications for a post from stream #5350 2015-01-25 18:40:47 +01:00
Sakshi Jain
8b1f0453a1 5560 Hide community spotlight setting if not enabled 2015-01-20 10:31:31 +05:30
James Kiesel
1c69dd7752 Add contacts/posts, and GZipping JSON exporter output 2015-01-15 00:20:19 +13:00
Jonne Haß
9c99ae357a Merge pull request #5493 from collimarco/solved5341 2015-01-06 14:43:58 +01:00
Steffen van Bergerem
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00
Marco Colli
f775d74cfd Add failing test 2014-12-24 11:49:35 +01:00
Marco Colli
76cc5e2d5c Add ActiveRecord::RecordNotFound catching. Add tests. 2014-12-22 12:36:09 +01:00
margori
27a1886834 Changes delete conversation button tooltip to 'hide' or 'delete' 2014-12-19 18:26:43 -03:00
James Kiesel
e174514d69 Add JSON exporter for user profile download 2014-12-16 08:55:35 +13:00
Steffen van Bergerem
8a50db76b1 Only show aspect chat control if chat is enabled 2014-12-05 13:07:17 +01:00
Steffen van Bergerem
4c655d8c8b Speed up notifications controller spec 2014-12-02 02:43:01 +01:00
Steffen van Bergerem
7b17b78de7 Try to improve the notifications controller spec 2014-12-01 02:27:19 +01:00
Lukas Matt
46097ba8c8 Test token authentication; should allow it 2014-11-13 11:42:24 +01:00
Jonne Haß
f532efeac5 Merge pull request #5276 from svbergerem/reshare-absolute-root 
Reshare the absolute root of a post

Conflicts:
	Changelog.md
 2014-10-14 19:40:35 +02:00
Jonne Haß
e892b115ac Merge pull request #5289 from svbergerem/convert-cukes-tags 
Convert some cukes to rspec tests
 2014-10-14 13:26:53 +02:00
Jonne Haß
0a20d6a2b7 Merge pull request #5316 from gdpelican/feature/allow-nil-http-agent 
Allow nil HTTP user agent
 2014-10-14 13:22:28 +02:00
Steffen van Bergerem
a12ca511c3 Convert close mentioned account cuke 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
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
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +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
89d468cdcc first round of specs and code cleanups/fixes 2014-09-15 01:37:23 +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ß
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
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
Steffen van Bergerem
ff84ee0485 Small style changes, add tests 2014-08-26 22:45:43 +02:00
Jonne Haß
42b08e8ab8 Update to Rails 4.1 2014-08-25 17:37:02 +02:00
Florian Staudacher
b07f6cf1db adapt rebased changes to jasmine 2 2014-08-23 16:47:48 +02:00
Jonne Haß
b3e59dc3d5 fix PostsController specs by using explicit form of the sign_in helper 2014-08-23 16:38:57 +02:00