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

12821 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabián Rodríguez
aabbea6ee2 fix issue #3671 reshare a post multiple times 2013-01-12 04:52:56 -02:00
Jonne Haß
4793ee5d5a Merge pull request #3821 from diasp/feature/notification-images 
Add images to notifications
 2013-01-11 03:59:10 -08:00
Diaspora Europe
c8ddba6b3e add images to notifications 2013-01-11 12:30:12 +01:00
Jonne Haß
414e29f23e remove merge conflict marker 2013-01-09 00:17:26 +01:00
Jonne Haß
a09a8cbffc Merge branch 'hotfix/0.0.2.2' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-01-09 00:11:29 +01:00
Florian Staudacher
b320e50236 bump Rails to 3.2.11 
see:
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
 2013-01-09 00:09:07 +01:00
Florian Staudacher
b97786661d add clarifying message to install script (+ fix typo) [ci skip] 2013-01-08 10:11:50 +01:00
Jonne Haß
c6f92198ba Merge pull request #3813 from Flaburgan/feature/3811-update-and-refactor-default-public-view 
Feature/3811 update and refactor default public view
 2013-01-07 10:31:16 -08:00
Flaburgan
3c84f2e0bd Update and refactor default public view, close #3811 2013-01-07 18:04:51 +01:00
Jonne Haß
38eba6703e add Armenian pluralization rule 2013-01-03 23:32:50 +01:00
Jonne Haß
26139fc2dc Merge branch 'hotfix/0.0.2.1' into develop 
Conflicts:
	Changelog.md
	Gemfile
	Gemfile.lock
	config/defaults.yml
 2013-01-02 23:45:53 +01:00
Jonne Haß
947127bec3 Merge branch 'hotfix/0.0.2.1' 2013-01-02 23:41:58 +01:00
Jonne Haß
11f82c794e Bump to Rails 3.2.10 as per CVE-2012-5664 
https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53
 2013-01-02 23:40:46 +01:00
Jonne Haß
beb32ce91f hovercards everywhere (comments, likes, top left sidebar stream summary thingy...) 
Say a word if you think it's getting too much...
 2013-01-01 22:59:12 +01:00
Jonne Haß
fde28e9bea display hovercards in reshares and on the linked name 2012-12-30 15:17:48 +01:00
Jonne Haß
5ff657204a Merge pull request #3809 from archSeer/patch-1 
Load the entire lib folder redux.
 2012-12-30 04:31:48 -08:00
Blaž Hrastnik
d3f5f34fa0 Load the entire lib folder refactor. 
Removed hack, replaced with a proper solution.
 2012-12-30 13:08:16 +01:00
Dennis Schubert
679d119d4d Merge pull request #3802 from Raven24/hovercards 
Bring back the hovercards... backbone style
 2012-12-29 06:41:17 -08:00
Florian Staudacher
0092acd492 re-add hovercards 
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
 2012-12-28 22:37:13 +01:00
Jonne Haß
42a01f3a38 fix regression in 0.0.3.0 (close #3805) 2012-12-27 17:58:18 +01:00
Florian Staudacher
c2be999395 Merge pull request #3723 from movilla/notice_conversations 
Show error and flash-notice when sending messages to non contacts
 2012-12-26 04:03:32 -08:00
movilla
597ab20715 Show error and flash-notice when sending messages to non contacts 2012-12-26 12:23:37 +01:00
Florian Staudacher
dd8660b12e Merge pull request #3787 from movilla/notications_all 
Mark all unread post-related notifications as read, if one of this gets opened. Close #3665
 2012-12-24 09:56:19 -08:00
movilla
c1b858a877 Mark all unread post-related notifications as read, if one of this gets opened 2012-12-24 00:13:32 +01:00
Florian Staudacher
4587a926ad Merge pull request #3740 from movilla/progress_upload 
Add progress percentage to upload images. Close #3633
 2012-12-22 02:57:03 -08:00
movilla
ceace52762 Add progress percentage to upload images 2012-12-20 21:24:09 +01:00
Jonne Haß
760ff95282 Merge pull request #3797 from Raven24/screenshots 
add cucumber feature for taking screenshots of important pages
 2012-12-17 12:26:52 -08:00
Florian Staudacher
ff173e233c add cucumber feature for taking screenshots of important pages 
- for before/after comparisons,
including rake tasks for easily generating the images from command line
 2012-12-17 20:25:34 +01:00
Jonne Haß
bf9201c002 Merge pull request #3794 from yurkobb/feature/uk-translation-improve 
Fix and improve Ukrainian locale
 2012-12-09 10:23:29 -08:00
Yury Bulka
d8dae23bc2 Fix typos, small improvements to Ukrainian translation 2012-12-09 13:55:26 +02:00
Yury Bulka
ae55f5ab9d Fixed and improved Ukrainian translation 2012-12-09 13:24:02 +02:00
Jonne Haß
c2e6f69626 Merge pull request #3686 from movilla/flash_conversation_mobile 
Add flash warning to conversation mobile, unification of flash warning with login and register mobile, and add support for flash warning to Opera browser
 2012-12-08 06:35:18 -08:00
movilla
763a893829 Add flash warning to conversation mobile, unification of flash warning with login and register mobile, and add support for flash warning to Opera browser 2012-12-08 14:59:01 +01:00
Jonne Haß
0677459ff9 Merge branch 'css_mobi_notif' of git://github.com/movilla/diaspora into develop 2012-12-08 13:47:13 +01:00
Jonne Haß
15b6b7c56e bump selenium-webdriver 2012-12-08 12:36:05 +01:00
Jonne Haß
7db763e67b remove allowed failures from .travis.yml 2012-12-08 01:15:51 +01:00
Jonne Haß
2fcf729f64 don't use a rails method in a pre-rails environment 2012-12-08 00:50:30 +01:00
Jonne Haß
4150a89eb8 fix Gemfile.lock 2012-12-07 22:41:06 +01:00
Florian Staudacher
94760f4c04 update jasmine gem, removed useless spec, + changelog) 2012-12-07 21:21:27 +01:00
Tom Scott
e717eaac70 Remove debugger from the Gemfile. 
Developers are free to choose their own debugging agent, but unless
it causes problems, personal development gems are not to be
included in the project's Gemfile. This is so each developer can
maintain their own comfortable environment without having workflows
enforced upon them.

Conflicts:
	Gemfile.lock
 2012-12-07 14:21:09 -05:00
Florian Staudacher
2c7f2d6fbb Merge branch 'feature/3779-hide-post-icon-alignment' of https://github.com/Flaburgan/diaspora into Flaburgan-feature/3779-hide-post-icon-alignment 
[ci skip]
Conflicts:
	Changelog.md
 2012-12-07 17:47:19 +01:00
Jonne Haß
366768eac7 the day I decide to switch to seleniums prerelease 2.27 comes out. great. anyway, still two timeouts, any ideas? anyone? 2012-12-06 18:38:06 +01:00
Jonne Haß
459df9b735 Merge pull request #3791 from movilla/suggest_member 
Translation "suggest member" of Community Spotlight
 2012-12-06 09:34:01 -08:00
Jonne Haß
c28412e1ea Merge pull request #3792 from movilla/mail_podmin 
Add feature contact podmin. Close #3770
 2012-12-06 09:32:50 -08:00
movilla
491c2a537c Add feature contact pod admin 2012-12-06 15:26:49 +01:00
movilla
65376a604b Allow translation of "suggest member" of Community Spotlight 2012-12-06 13:15:34 +01:00
Jonne Haß
e05edcfda6 Revert "hmm, I hate it if these things work locally..." 
This reverts commit 4cebe42375.
 2012-12-06 10:45:46 +01:00
Jonne Haß
4cebe42375 hmm, I hate it if these things work locally... 2012-12-06 10:45:12 +01:00
Jonne Haß
d836d1102a let travis find the selenium prerelease 2012-12-06 10:39:31 +01:00
Jonne Haß
613fbb6ffd lets see what travis has to say about the selenium prerelease 2012-12-06 10:37:11 +01:00