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

13100 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Flaburgan
65c16ac44c Update changelog 2012-12-02 13:26:46 +01:00
Flaburgan
aee6068412 Resize deletelabel and ignoreuser images to align them 2012-12-02 13:20:24 +01:00
Jonne Haß
18573fe4bb Merge pull request #3781 from liamn/feature/update-cat-image 
Update cat image so it's secure - new image from khanb1 on flickr.
 2012-12-02 03:13:23 -08:00
Liam
c9559b93f5 Update cat image so it's secure - new image from khanb1 on flickr. 2012-12-02 10:31:45 +00:00
Jonne Haß
9d954b1a60 Merge pull request #3777 from davecocoa/feature/3775-fix-tags-on-profile-edit 
fix the tag handling on the profiles edit page
 2012-12-01 09:18:09 -08:00
David McMullin
86ee4e2020 update changelog 2012-12-01 16:07:41 +00:00
David McMullin
6e912adb88 add a necessary param, fix the retrieve limit 2012-12-01 11:18:13 +00:00
Jonne Haß
bf27cca03a Do not generate paths like /a/b/c/config/boot.rb/../../Gemfile to require and open things, create a proper path instead. 2012-11-30 18:16:56 +01:00
Jonne Haß
2a7a0b7b99 * made number of unicorn worker processes configurable 
* made configuration loader indepenent of rails
* corrected mismatch between example and default config (server.db/server.database)
 2012-11-30 14:00:25 +01:00
Jonne Haß
669dd87b11 extract configruation system to a gem 2012-11-30 13:35:59 +01:00
Dennis Schubert
656e52360f Remove REEs garbage collection [ci skip] 
We are not using REE anymore, so...
 2012-11-29 22:57:38 +01:00
Jonne Haß
7aa0726971 use file? instead of exists? to check for correct ca bundle path 2012-11-27 21:14:44 +01:00
Jonne Haß
fc180a4521 guard: minimize running all specs [ci skip] 2012-11-26 14:30:30 +01:00
Jonne Haß
bf698f3882 Do not strip "markdown" in links when posting to services, fix #3765 2012-11-26 14:16:43 +01:00
Jonne Haß
995775955e Merge pull request #3737 from davecocoa/feature/2704-fix-aspects 
Feature/2704 fix aspects
 2012-11-25 10:07:20 -08:00
David McMullin
c3c603f8cd Update changelog 2012-11-25 17:41:58 +00:00
David McMullin
0873ae9ab7 improve behaviour of deselect all 2012-11-25 17:38:19 +00:00
David McMullin
f290bcf169 add tests so it doesn't break again 2012-11-25 17:38:19 +00:00
David McMullin
f6b32fd13a rename the JS so the magic can return 2012-11-25 17:38:19 +00:00
Jonne Haß
96924b8458 updated changelog [ci skip] 2012-11-25 18:31:40 +01:00
Jonne Haß
7b548fd571 Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags 
port tagFollowings to BackBone
 2012-11-25 09:30:47 -08:00