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

546 commits

Author SHA1 Message Date
Hincu Petru
1d09978440 Fix hidding of poll publisher for close action 2014-06-25 10:54:00 +00:00
Jason Robinson
b246c7b5ef Merge branch 'master' into develop 2014-06-24 22:26:20 +03:00
Jason Robinson
c7536e523a Re-bump version to 0.4.0.1 2014-06-24 22:23:26 +03:00
Jason Robinson
bd4dea608a Merge branch 'hotfix/0.4.0.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-06-24 22:08:07 +03:00
Jason Robinson
90dd5d3868 Bump to 0.4.0.1 2014-06-24 22:01:12 +03:00
Jason Robinson
c475a3985e start new development cycle 2014-06-22 19:32:23 +03:00
Jason Robinson
51ecae1b77 bump to 0.4.0.0 2014-06-22 19:01:31 +03:00
Jonne Haß
b7d310f318 Merge pull request #5012 from goobertron/changelog 
Update changelog

Conflicts:
	Changelog.md
 2014-06-22 15:03:23 +02:00
goobertron
184f6225df Update changelog to reference fixes rather than bug reports, fix couple of typos. 2014-06-22 13:34:31 +01:00
Jason Robinson
e4e9f40b2c Revert "Fix toggling services for mobile bookmarklet" 
This fixed the toggling of services, but broke the actual
bookmarklet :)

This reverts commit 1bd7989045.
 2014-06-19 21:47:34 +03:00
Jason Robinson
1bd7989045 Fix toggling services for mobile bookmarklet 2014-06-02 23:29:47 +03:00
Jonne Haß
553a5258a8 Merge pull request #4968 from taratatach/4967-use-https-for-osm-locator 
Use https to load the location from OSM
 2014-05-26 20:11:49 +02:00
Jonne Haß
77133a4062 Merge pull request #4963 from Ruxton/feature/rake_task_to_run_account_deletion_fixes_4792 
Rake task for running outstanding account deletions
 2014-05-24 18:03:10 +02:00
Jonne Haß
a3bfc4e92d Add changelog entry for #4758 [ci skip] 2014-05-24 17:58:20 +02:00
Jonne Haß
cbd9c56a7a Merge pull request #4919 from hpetru/4776-mention-on-mobile 
Unescape text before add mention, this commit solve #4776

Conflicts:
	Changelog.md
 2014-05-24 17:34:29 +02:00
Jonne Haß
63c44d9f6b Merge pull request #4781 from Zauberstuhl/report_feature 
It is now possible to report posts and comments
 2014-05-15 19:53:44 +02:00
Oliver Azevedo Barnes
aec0c700b3 Add account_deleter.rb to load_libraries initializer 2014-05-07 14:36:18 -05:00
Hincu Petru
e699a682f4 Unescape text before add mention, this commit solve #4776 2014-05-06 12:13:43 +00:00
Florian Staudacher
95efbfa9c9 add changelog for #4932 [ci skip] 2014-05-06 14:06:50 +02:00
Steffen van Bergerem
232e4fa236 Improve set read/unread in notifications dropdown 2014-04-16 23:33:22 +02:00
Jason Robinson
b64e418020 Merge pull request #4810 from svbergerem/notifications-no-auto-mark-as-read 
Remove auto 'mark as read' in notifications dropdown
 2014-04-16 21:56:53 +03:00
Steffen van Bergerem
e1685c9a29 Remove auto 'mark as read' for notifications 2014-04-15 14:51:38 +02:00
Gabriel Lima
f6c0648a55 bug #4832 - send the rspec test and changelog 2014-04-15 09:23:58 -03:00
flaburgan
a4886fa77b SPV: Improve padding and interaction counts 2014-04-13 11:27:12 +02:00
Jason Robinson
ee3a9f9be0 Merge pull request #4912 from goobertron/settings 
Reorder items on settings page and improve wording
 2014-04-12 21:37:52 +03:00
Jason Robinson
6947a1945c Merge pull request #4883 from MrZYX/uuid 
Use uuids for guid generation
 2014-04-11 16:40:57 +03:00
Jonne Haß
66c511197c Merge pull request #4917 from hpetru/4806-new-status_messages-page 
Redirect to stream_path if is destkop
 2014-04-08 13:45:04 +02:00
goobertron
63abe9055b Reorder items on settings page and improve wording 
Update cukes to be text-independent
Update changelog
 2014-04-08 00:28:25 +01:00
Jonne Haß
5a60cb72bf Merge pull request #4899 from hpetru/poll-in-post-preview 
Add poll in post preview
 2014-04-04 14:12:13 +02:00
Jonne Haß
be19c2f104 Merge pull request #4897 from hpetru/update-poll-view-in-stream 
I update design for poll in post stream
 2014-04-04 09:54:06 +02:00
Jonne Haß
9eb2339368 Merge pull request #4894 from hpetru/4893-poll-in-spv 
Add poll for single post view
 2014-04-03 20:36:34 +02: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
Jannik Streek
167884e565 added changelog pull link 2014-03-31 18:14:08 +02:00
Jannik Streek
a3837a4f19 added changelog entry 2014-03-31 18:14:07 +02:00
Jonne Haß
0ea53aa5ed Merge pull request #4882 from hpetru/4868-mention-inside-tags 
4868 mention inside tags
 2014-03-31 12:06:39 +02:00
Jonne Haß
98057885ac use uuids for guid generation 2014-03-30 15:38:18 +02:00
Jonne Haß
07aec2a630 Merge branch 'hpetru-4864-ui-bug-when-tag-is-long' into develop 2014-03-30 13:39:32 +02:00
Jonne Haß
3a91061d4f Merge pull request #4708 from goobertron/opengraph_link_fix 
Opengraph link fix (issue #4492)
 2014-03-30 11:15:29 +02:00
Jonne Haß
1b70f6fe09 Replace .rvmrc by .ruby-version 
Also relax the requirement. The .ruby-version represents
merely a recomendation for the Ruby version. The incompability
issues in the Ruby world are far less currently, than they were
when we introduced strict version enforcement. Thus strict
enforcement is no longer appropiate. Same holds for RubyGems.

This implicity also removes the recomendation on using RVM.
The .ruby-version file is supported by all major Ruby version
managers. Gemsets are no longer a needed feature since Bundler
handles multiple concurrrently installed Gems just well.
 2014-03-24 15:33:29 +01: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
cd241ee94d Hovercards! Everywhere! 2014-03-23 01:15:26 +01:00
Steffen van Bergerem
4fc9c6416e Port notifications to Bootstrap 2014-03-19 18:45:52 +01:00
Steffen van Bergerem
f217a5bc11 Add filters to notifications controller 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
Jonne Haß
835608f06f Merge pull request #4856 from hincupetru/3692-hashtags-inside-markdown-link 
Check if the hashtag is a link in function .hashtagify
 2014-03-16 14:39:20 +01:00
Jonne Haß
cfca0e88f1 Revert "Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link" 
This reverts commit 06ab498620, reversing
changes made to 3c4d8d95d3.

Conflicts:
	Changelog.md
 2014-03-15 21:08:54 +01:00
Jonne Haß
f2fedea3db Merge pull request #4853 from hincupetru/4693-notifications-hovercard-avatars-misaligned 
Fixed "hovercard avatars misaligned in notifications drop-down"
 2014-03-15 19:15:08 +01:00
Jonne Haß
06ab498620 Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link 
Solved problem with hashtags inside markdown links
 2014-03-15 19:12:37 +01:00
Jonne Haß
3c4d8d95d3 Merge pull request #4794 from Flaburgan/improve-search-page 
Add handle indication on search page, improve design
 2014-03-15 19:09:42 +01:00
Jonne Haß
d4e046ecbc Merge pull request #4787 from hincupetru/4726-infinite-photo-stream 
Added limit by max_time to photos#index for prevent "infinite photo stream"
 2014-03-15 19:07:48 +01:00