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

416 commits

Author SHA1 Message Date
theworldbright
d410d2ee76 Fix bug where flash error reappeared #6136 
closes #6146
closes #6136
 2015-07-03 05:25:22 +02:00
Faldrian
12678bde53 Added cucumber step to add multiple posts in one step 
closes #6118
 2015-06-19 22:19:29 +02:00
Benjamin Neff
85087123f0 remove travis hax ... works on here ... I hope on travis too 
closes #5964
 2015-05-18 03:23:39 +02:00
Steffen van Bergerem
399fdb2c7d Check request.format :mobile in home controller 2015-05-05 01:39:48 +02:00
Steffen van Bergerem
a22127bfb1 Add ctrl+enter shortcut for conversations 2015-05-04 03:38:42 +02:00
Jonne Haß
2c7848e3cb Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations" 
This reverts commit 096fa2ddbb, reversing
changes made to f7d1105148.
 2015-05-04 00:36:27 +02:00
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +02:00
Jonne Haß
d959dd725b Merge pull request #5850 from svbergerem/modal-for-new-aspect 
Use Bootstrap modal for new aspect form
 2015-04-20 22:34:51 +02:00
Marcelo Briones
6636a89118 Add participation counter 2015-04-11 14:41:17 -03:00
Asphyxia
5fb328864e Activity stream keeping retracted participations 2015-04-10 21:46:42 -03:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
Steffen van Bergerem
0856eb8f86 Merge pull request #5788 from AugierLe42e/fix-search-element-selection 
Fixes #5787
 2015-03-16 23:36:51 +01:00
Augier
571685d590 Fix the broken searchbar (#5787) 2015-03-16 22:07:51 +01:00
goobertron
2b6ca180ce Add tests for liking and unliking posts 2015-03-14 14:50:35 +00:00
Jonne Haß
cc585805ad Merge pull request #5762 from svbergerem/entypo-controls 
Use entypo for control icons
 2015-03-12 19:29:40 +01:00
Steffen van Bergerem
af9d6ddab3 Use handlebars helpers wherever possible 2015-03-12 16:20:32 +01:00
Steffen van Bergerem
cb30ffc368 Use entypo for post control icons 2015-03-12 13:08:23 +01:00
Augier
95f4675ddf Port of notifications to Backbone 2015-03-11 02:11:05 +01:00
Steffen van Bergerem
73d04b706e Use entypo icons for left navbar 2015-03-09 17:57:50 +01:00
Steffen van Bergerem
c838389b67 Fix invitations and tests 2015-03-02 00:04:56 +01:00
Steffen van Bergerem
53714c4699 Fix notification for new conversations 2015-02-19 13:39:25 +01:00
Jonne Haß
34ad598cff Merge pull request #5594 from Faldrian/4055-add_contacts_mobile 
4055 add contacts mobile
 2015-02-15 23:12:18 +01:00
Faldrian
8f3c03edfa Added dropdown to add/remove people from/to aspects in mobile view 2015-02-15 22:08:15 +01:00
Jonne Haß
0af6fabfc7 Merge pull request #5650 from svbergerem/improve-hovercards-cuke 
Make the hovercards cuke more reliable
 2015-02-15 15:58:47 +01:00
arlogn
43a2a5c336 profile photos as thumbnails 2015-02-14 02:27:32 +01:00
Steffen van Bergerem
3db305264e Make the hovercards cuke more reliable 2015-02-10 20:48:51 +01:00
goobertron
42cd2337be Amend all text strings in en locales to use sentence case 
Adapt cukes to work with new capitalisation rules
 2015-01-31 17:44:57 +00:00
Faldrian
31c39a59d1 Added post moderation buttons in SPV 2015-01-25 05:11:59 +01:00
flaburgan
3ff298606f Add menu mobile and drawer navigation tests 2014-12-28 18:49:03 +01:00
Jonne Haß
63e9d7b73f Update aspect list checkmarks only after the stream was fetched 2014-12-05 03:18:30 +01:00
Steffen van Bergerem
b3f7acb91b Fix SlowFinderErrors 2014-12-03 22:31:02 +01:00
Steffen van Bergerem
9a047749fc Fix delete a photo cuke 2014-12-02 23:56:54 +01:00
Steffen van Bergerem
25e4e558c5 Ask for confirmation when leaving a submittable publisher 2014-11-02 01:49:33 +01:00
Jonne Haß
1c0cf98958 Merge pull request #5237 from jaideng123/added_infinite_scrolling_to_notedropdown 
Notifications Dropdown infinite scrolling
 2014-10-14 13:37:55 +02:00
Steffen van Bergerem
42a3e702e6 Fix poll for Bootstrap publisher 2014-10-11 19:18:13 +02:00
jaideng123
bd24d6bebe Added cucumber test for notifications dropdown 2014-10-06 13:55:46 -05:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
Florian Staudacher
fe0f8df9c9 add a 'css mutex' for cuke failures 2014-09-17 14:36:04 +02:00
Florian Staudacher
300496090b add the publisher back to ones own profile, fix some cukes 2014-09-16 02:16:14 +02:00
Jonne Haß
291a2f31df Merge branch 'release/0.4.1.0' into develop 2014-09-01 19:40:40 +02:00
Florian Staudacher
36e92b322f fix hovercard aspect selectio z-index by moving it out of the stream element 
- create handlebars template for hovercards
- fix notifications-dropdown (workaround) to remain open when aspect
  selector is clicked
 2014-09-01 19:39:23 +02:00
Steffen van Bergerem
854dcf04db Display new conversation form on conversations/index 2014-08-31 18:02:37 +02:00
goobertron
a90627467b Add sign-up tests for mobile, minor adjustments to other mobile tests 2014-08-30 18:35:10 +01: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
khall
b7c68031fa Last rspec fix brought to you by jhass 2014-08-26 17:12:58 -07:00
khall
875895f2d0 Convert specs to RSpec 3.0.4 syntax with Transpec 
This conversion is done by Transpec 2.3.6 with the following command:
    transpec features

* 19 conversions
    from: obj.should
      to: expect(obj).to

* 1 conversion
    from: == expected
      to: eq(expected)

For more details: https://github.com/yujinakayama/transpec#supported-conversions
 2014-08-26 17:11:44 -07:00
khall
de3e0bd91a Updating cucumber features 2014-08-26 17:11:44 -07:00
Steffen van Bergerem
ff84ee0485 Small style changes, add tests 2014-08-26 22:45:43 +02:00
Jonne Haß
caa5067721 don't make loading an assertion, just try waiting for it 2014-08-24 22:59:22 +02:00