Dennis Schubert
e0420d733a
Merge branch 'stable' into develop
2015-06-08 00:49:55 +02:00
Benjamin Neff
010afa1019
refactor: iterate over visiblities
...
closes #6060
2015-06-08 00:45:16 +02:00
Steffen van Bergerem
700df9af23
Fix jasmine tests
...
Fix notifications jasmine tests
2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f64eb9ff41
Fix hound remarks
2015-06-04 18:05:44 +02:00
theworldbright
98f11b944a
Fix styleguide violations
...
Fix hound remark 12
Remove unnecessary explicit div tag
Rename el_**** to ****El (hound remark 2 and 3)
Only find and replace operations were done with
this commit
Fix hound remark 4 and 8
Fix hound remark 6
Fix hound remark 7
Fix hound remark 9
Fix hound remark 10 and 11
Fix hound remark 13
Fix hound remark 1
Change single quotes to double quotes
Change single quotes to double in publisher view
Fix camelCase and missing {} in publisher view
Change single quotes to double in bookmarklet view
Use dot notation for serializedForm in publisher
Change single quotes to double in bookmarklet spec
Change single quotes to double in publisher spec
Fix missing {} in publisher views
Use ruby 1.9 hash syntax in invite_link
Fix indentation in publisher view
2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f5bb4a4557
Refactor button colors
2015-06-04 18:05:44 +02:00
Augier
207b6c6153
Port to Bootstrap 3
...
correcting images display on stream sidebar
Corrections on profile page
2015-06-04 18:05:43 +02:00
Benjamin Neff
289753e068
add "original post deleted" message on single post view
...
closes #5968
2015-05-19 03:00:51 +02:00
Steffen van Bergerem
59e57c013b
Update jasmine-ajax
...
closes #5937
2015-05-10 01:59:17 +02:00
Steffen van Bergerem
a22127bfb1
Add ctrl+enter shortcut for conversations
2015-05-04 03:38:42 +02:00
Jonne Haß
37ec00f80b
Merge pull request #5854 from svbergerem/remove-managing-services-standalone
...
Remove 'manage services' link in standalone mode
2015-04-20 22:36:11 +02:00
Steffen van Bergerem
b885b8583d
Remove 'manage services' link in standalone mode
2015-04-08 12:49:05 +02:00
Steffen van Bergerem
75ef9f47d0
Use Bootstrap modal for new aspect form
2015-04-07 10:45:09 +02:00
Steffen van Bergerem
1701bc30d0
Don't add mentions and reshares to all streams
2015-04-01 16:51:08 +02:00
Steffen van Bergerem
a161e4d3a7
Uncomment jasmine tests
2015-03-18 00:01:22 +01:00
Steffen van Bergerem
81cd1753e4
Improve link to original post in reshared polls
2015-03-15 17:07:16 +01:00
Hincu Petru
9589cb2e0f
disable poll voting for reshared post
2015-03-15 16:46:48 +01:00
Augier
322ee30005
Tests with Jasmine
2015-03-15 14:52:49 +01:00
Augier
f4534ec412
Refactor notification badge view (again)
2015-03-15 11:48:06 +01:00
Augier
673661b798
Ported searchbar
2015-03-15 11:48:06 +01:00
Augier
2a9fddf7a0
Port notifications to backbone part. 2
2015-03-15 11:48:06 +01:00
Augier
95f4675ddf
Port of notifications to Backbone
2015-03-11 02:11:05 +01:00
Steffen van Bergerem
1b2b10877a
Fix services char counter
2015-03-09 21:18:10 +01:00
Steffen van Bergerem
73d04b706e
Use entypo icons for left navbar
2015-03-09 17:57:50 +01:00
Steffen van Bergerem
e188782a9a
Remove blueprint code
2015-03-02 00:04:57 +01:00
Steffen van Bergerem
c838389b67
Fix invitations and tests
2015-03-02 00:04:56 +01:00
Augier
168adae009
Adding help section for chat
2015-02-26 18:06:39 +01:00
Steffen van Bergerem
eb7e2eac9d
Update jasmine-ajax
2015-02-17 04:03:42 +01:00
Steffen van Bergerem
9373d5bd20
Fix jasmine tests for new help routes
2015-02-14 19:38:00 +01:00
Augier
aa62266376
Added routing system to open a section in help
2015-02-14 18:05:40 +01:00
Steffen van Bergerem
8962d75eb7
Conversations: fix badge count and automatic scrolling
2015-02-10 19:11:20 +01:00
Steffen van Bergerem
ab6732cac1
JSHint eqeqeq
2015-02-08 23:41:32 +01:00
Steffen van Bergerem
5fa6b8253e
JSHint unused and undefined variables
2015-02-08 23:41:32 +01:00
Steffen van Bergerem
a9a480da0a
JSHint semicolon errors
2015-02-08 23:41:31 +01:00
Steffen van Bergerem
6b0a5823e3
Add JSHint javascript linter
2015-02-08 23:41:31 +01:00
Steffen van Bergerem
c1d714d2c7
Remove unused files, fix syntax in jasmine tests
2015-02-07 21:17:51 +01:00
Steffen van Bergerem
8b33b9eb18
Merge pull request #5602 from Faldrian/more-shortcuts
...
Add shortcuts for reshare, expand Post and open first link in a post
Conflicts:
config/locales/diaspora/en.yml
2015-02-07 14:41:56 +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
099974ddef
Add shortcuts for reshare, expand Post and open first link in a post
2015-01-28 16:19:18 +01:00
Steffen van Bergerem
99fd5712b2
Fix jasmine specs
...
toBeTruethy and toBeFalsy don't test anything
use toBeTruthy() and toBeFalsy() instead
2015-01-04 17:13:18 +01:00
Steffen van Bergerem
9de6a26a22
Port contacts page to backbonejs
2015-01-04 17:13:18 +01:00
François Lamontagne
4c33a6adeb
Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ (issue #5273 )
2015-01-03 13:25:16 -05:00
Jonne Haß
63e9d7b73f
Update aspect list checkmarks only after the stream was fetched
2014-12-05 03:18:30 +01:00
Faldrian
29f55f42b6
truncate long opengraph description to 250 chars in mobile and stream view
2014-11-29 17:18:01 +01:00
Lukas Matt
2712b413c3
Fixed privilege spec; use correct container for trigger event
2014-11-13 12:28:45 +01:00
Lukas Matt
bb18c8e028
Test chat privilege option; should replace text/icon on trigger
2014-11-13 11:49:03 +01:00
Steffen van Bergerem
25e4e558c5
Ask for confirmation when leaving a submittable publisher
2014-11-02 01:49:33 +01: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ß
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