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

598 commits

Author SHA1 Message Date
Steffen van Bergerem
3f3087c77f Port tags page to Bootstrap 2014-08-28 18:02:02 +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
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ß
ac998407b5 bump jasmine-core 2014-08-25 19:16:55 +02: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
Florian Staudacher
304e560e43 use new jasmine async code 2014-08-23 16:46:08 +02:00
Florian Staudacher
d4aca571ac add jasmine-jquery gem and use it, port some more specs 2014-08-23 16:46:08 +02:00
Florian Staudacher
4d3874cc2e port more specs, add aspect factory 2014-08-23 16:46:04 +02:00
Florian Staudacher
adf7aa98dd port router specs, don't test backbone - our own code is enough 2014-08-23 16:38:58 +02:00
Florian Staudacher
c81379d38f port some more JS specs to jasmine 2.0... still a lot to do 2014-08-23 16:38:57 +02:00
Florian Staudacher
43f156420d update jasmine mock-ajax, port SpecHelper to jasmine 2.0 
- some tests should be passing again now
 2014-08-23 16:38:57 +02:00
Jonne Haß
b582e1f707 i18n.js: Add interface to retrieve entire sections 
And make use of that in HelpView
 2014-08-18 21:06:52 +02:00
Jonne Haß
ae24495c7d Merge pull request #5127 from Raven24/hpetru-2875-ignore-user-posts 
Remove ignored peoples posts without refresh (II)
 2014-08-18 11:35:56 +02:00
Florian Staudacher
4fd9bae056 refactor global event broker and user blocking from stream posts 2014-08-17 14:05:56 +02:00
Steffen van Bergerem
022bc1007d Remove unused code 2014-08-16 11:47:31 +02:00
Jonne Haß
92a6fc9eb5 Add fallback system to frontend I18n system 
Load the default locale and fall back to it on missing key
and interpolation errors
 2014-08-15 13:53:28 +02:00
Florian Staudacher
163b76ae3d Merge branch '2875-ignore-user-posts' of https://github.com/hpetru/diaspora into hpetru-2875-ignore-user-posts 
Conflicts:
	Changelog.md
 2014-08-13 14:30:28 +02:00
Jonne Haß
0421d9336a Merge pull request #5100 from Faldrian/feature/add_help_keyboard_shortcuts 
added keyboard shortcut help topic
 2014-08-03 20:12:15 +02:00
Faldrian
9636f372a4 inserted line breaks and wrote a test for app.views.Content.smallPhotos 2014-08-03 17:17:12 +02:00
Faldrian
207b351049 added test for help section keyboard shortcuts 2014-08-02 10:30:17 +02:00
arlogn
2394c3df39 flexible font-size for sign_in podname huge text 2014-07-06 19:18:21 +02:00
Hincu Petru
653612b74d Remove posts for ignored person 2014-06-25 08:56:12 +00:00
Jason Robinson
126ced4383 Fix broken bookmarklet if params have encoded linefeeds. 
Closes #4994
 2014-06-22 11:48:24 +03:00
Erwan Guyader
24d2ac0ec2 4967 Use https to load the location form OSM 2014-05-26 11:34:01 +02:00
Jonne Haß
e6348aa705 Use toggle() to hide the poll creator 2014-05-24 21:40:48 +02:00
Jonne Haß
9537c45d2a Merge pull request #4916 from hpetru/validate-poll-answer 
I added the validation to poll question and poll answer

Conflicts:
	app/assets/javascripts/app/views/publisher_view.js
 2014-05-24 17:42:18 +02:00
Florian Staudacher
693ded8298 unset any stream that might be left over from earlier specs 2014-05-20 20:52:25 +02:00
Florian Staudacher
46e3c5a870 add 'loginAs' to bookmarklet spec 2014-05-18 23:37:59 +02:00
Florian Staudacher
9da3bc347b disable publisher after successfully posting in standalone mode 2014-04-25 19:51:45 +02:00
Florian Staudacher
0d51bba959 port bookmarklet to Backbone.js, use gon for params (fixes #4931) 2014-04-19 17:41:21 +02:00
Hincu Petru
57de031f6b I added the validation for blank to poll question and poll answer 2014-04-07 17:17:41 +00:00
Jonne Haß
682a49605e Merge pull request #4910 from hpetru/rewrite-poll-creator 
Rewrite poll creation inputs
 2014-04-06 22:27:01 +02:00
Hincu Petru
2d3933ccd8 Rewrite poll creation inputs 2014-04-06 15:01:18 +00:00
Hincu Petru
2ae4d41db3 Fixed 4903 and not render vote form when user is not logged 2014-04-05 14:29:07 +00:00
Hincu Petru
6c00db23cd I update design for poll in post stream 2014-04-03 20:57:14 +00:00
Hincu Petru
cee90e737c Make poll to be compatible with bootstrap 2014-04-03 09:03:54 +00:00
Hincu Petru
fed5ea8cda Refactored poll_view.js 2014-04-02 16:19:07 +00:00
Jonne Haß
211963d320 Merge pull request #4889 from hpetru/4874-malformed-url 
Catch error from decodeURI for prevent crash in posts parsing
 2014-04-01 00:49:27 +02:00
Hincu Petru
552310796c Catch error from decodeURI for prevent crash in posts parsing 2014-03-31 20:24:47 +00:00
Jannik Streek
2d0abbae23 added jasmine test for poll view 2014-03-31 18:14:07 +02:00
Jannik Streek
dde39aa1bb added jasmine publisher tests 2014-03-31 18:14:07 +02:00
Jonne Haß
ab15bad53f Merge pull request #4858 from hincupetru/4514-clicking-show-more-comments-empties-textarea 
Save textarea value before rendering comments when clicked 'show more....'
 2014-03-24 14:56:45 +01:00
Steffen van Bergerem
4fc9c6416e Port notifications to Bootstrap 2014-03-19 18:45:52 +01:00
Steffen van Bergerem
eabdc7390c Port aspect membership dropdown and hovercards 2014-03-19 17:54:22 +01:00
Hincu Petru
1cef3e42ce I save textarea value before rendering comments when clicked 'show more..' 2014-03-19 12:36:04 +00:00