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

15947 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
7060840d0f use stdlib logger for FEDERATION_LOGGER, closes #5657 2015-05-04 04:16:31 +02:00
Jonne Haß
2570d88cc3 Merge pull request #5904 from Raven24/JesseWeinstein-patch-1 
prefill bookmarklet with markdown-formatted content
 2015-05-04 04:10:03 +02:00
Jonne Haß
f2e26dfafc Merge branch 'stable' into develop 2015-05-04 04:07:10 +02:00
Jonne Haß
19fd36b1ce add changelog entry for #5908 [ci skip] 2015-05-04 04:06:55 +02:00
Jonne Haß
971a3dd021 Merge branch 'stable' into develop 2015-05-04 04:04:48 +02:00
Steffen van Bergerem
0cffa00004 Add syntax highlighting for markdown content 2015-05-04 04:04:34 +02:00
Jonne Haß
381e4978d9 Merge pull request #5909 from svbergerem/update-jasmine 
Update jasmine
 2015-05-04 03:53:54 +02:00
Jonne Haß
2dc7f4c2b5 Merge branch 'stable' into develop 2015-05-04 03:51:38 +02:00
Steffen van Bergerem
dd2e1ea29e Use rails-assets for jquery.elastic.js 2015-05-04 03:51:20 +02:00
Jonne Haß
4f6d90277b Merge branch 'stable' into develop 2015-05-04 03:42:42 +02:00
Steffen van Bergerem
c64c4114ac Update jquery-rails 2015-05-04 03:42:36 +02:00
Jonne Haß
234e205602 Merge branch 'stable' into develop 2015-05-04 03:38:44 +02:00
Steffen van Bergerem
a22127bfb1 Add ctrl+enter shortcut for conversations 2015-05-04 03:38:42 +02:00
Jonne Haß
8172eee43c Merge branch 'stable' into develop 2015-05-04 03:31:34 +02:00
Steffen van Bergerem
1fc31cc313 Fix close account for mobile view 
and use Bootstrap modal for desktop close account
 2015-05-04 03:31:28 +02:00
Jonne Haß
9a86a0d246 Merge pull request #5918 from jhass/ruby22 
Recommend Ruby 2.2, drop Ruby 2.0 support
 2015-05-04 02:39:49 +02:00
Jonne Haß
4faaa2a804 Merge branch 'stable' into develop 2015-05-04 01:00:37 +02:00
Jonne Haß
02cdf803b6 add travis badge for stable branch [ci skip] 2015-05-04 01:00:12 +02:00
Jonne Haß
a365d802c7 Recommend Ruby 2.2, drop Ruby 2.0 support 
As per https://www.loomio.org/d/VuwvXWU7/ruby-versions?proposal=DM8zidhc
 2015-05-04 00:58:38 +02:00
Jonne Haß
4fad5041cf update changelog and version for 0.6.0.0 2015-05-04 00:47:36 +02:00
Jonne Haß
f257658e46 Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations"" 
This reverts commit 2c7848e3cb.
 2015-05-04 00:43:41 +02:00
Jonne Haß
04c6f83b0e Merge branch 'stable' into develop 2015-05-04 00:43:26 +02:00
Jonne Haß
0021326fc9 build stable 2015-05-04 00:42:54 +02:00
Jonne Haß
db08cec9c0 update changelog and version for 0.5.1.0 2015-05-04 00:41:55 +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
Jonne Haß
69842b84a4 Merge branch 'master' into develop 2015-05-03 15:48:42 +02:00
Jonne Haß
f8b3836d1f Merge branch 'release/0.5.0.0-RC' 2015-05-03 15:45:49 +02:00
Jonne Haß
8e2278b80d Merge branch 'release/0.5.0.0-RC' into develop 2015-05-03 15:43:55 +02:00
Jonne Haß
260a10b2f2 updated 60 locale files [ci skip] 2015-05-03 15:43:35 +02:00
Steffen van Bergerem
19a19919bb Update jasmine 2015-05-02 16:46:30 +02:00
Jonne Haß
5371c3876f Merge pull request #5907 from pravi/add-x-permissions-to-scripts 
add execution permission to scripts
 2015-05-02 15:14:51 +02:00
Praveen Arimbrathodiyil
a4210cd501 drop install scripts, see #5907 2015-05-02 18:39:19 +05:30
Florian Staudacher
0bb316e893 update bookmarklet 
* snippet now in a separate JS file - compiled and uglified with the other assets
* popup gets centered in opening browser window
* publisher gets pre-filled with markdown-styled content
 2015-05-01 20:20:46 +02:00
Florian Staudacher
9479be6360 Merge branch 'patch-1' of git://github.com/JesseWeinstein/diaspora into JesseWeinstein-patch-1 2015-05-01 13:18:46 +02:00
Jonne Haß
2382f9eb24 Merge pull request #5896 from Raven24/fix-db-seeds 
fix minor errors in db:seed task
 2015-04-30 13:09:54 +02:00
Jonne Haß
fe64db013b Merge pull request #5888 from szlend/5508-fix-post-presenter-autoreload 
Issue #5508: Remove post_presenter from initializers
 2015-04-30 13:06:21 +02:00
Jonne Haß
78ea2c8204 Merge pull request #5878 from Flaburgan/chrome-frame 
Fix the IE version number extractor to work without space between MSIE and the version number
 2015-04-30 13:04:29 +02:00
Jonne Haß
59e8fc93a2 Merge pull request #5559 from SWW13/aspect_sort 
Readd aspect sorting
 2015-04-30 13:02:24 +02:00
Steffen van Bergerem
31bbfe8eab Merge pull request #5887 from szlend/5874-fix-bold-links 
Issue #5874 Fix styled links
 2015-04-30 11:05:24 +02:00
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +02:00
Benjamin Neff
3c09756417 refactoring javascript and controller 
- move to contacts.js
- use json
- move to aspects_controller
- add route
- rewrite test
- fix css in chrome
 2015-04-28 01:57:43 +02:00
Florian Staudacher
913d3484a6 fix minor errors in spec helper scripts, remove db/seeeds.rb 2015-04-28 01:02:27 +02:00
Simon Wörner
cee4f1c3cd fixed aspect sorting, added minimal jquery ui, added test 2015-04-26 01:57:00 +02:00
Jonne Haß
288b83bd8d Merge pull request #5891 from mrbrdo/3824_environment_sanity_check 
fix script/server sanity checks
 2015-04-25 19:09:43 +02:00
Jan Berdajs
2fa4c07a9c fix sanity checks in script/server, remove migration check because it is too slow and Rails 4 checks it on first request anyway 2015-04-25 19:07:25 +02:00
Akash Agrawall
3763a87744 Environment sanity checks in script/server #3824 2015-04-25 17:46:51 +02:00
Jonne Haß
cfa4567d26 Merge pull request #5886 from artoartnik/develop 
Fix unconventional image asset inclusion in css asset
 2015-04-25 17:40:45 +02:00
Simon Žlender
bec886109f Issue #5508: Remove post_presenter from initializers 2015-04-25 17:21:07 +02:00
Simon Žlender
f5ce612299 Issue #5874 Fix styled links 2015-04-25 16:51:11 +02:00
Jonne Haß
e50dfea875 Merge pull request #5885 from mrbrdo/server-script-fix 
fix broken output of script/server
 2015-04-25 16:31:08 +02:00