Jonne Haß
|
abe0629c02
|
bump rails-assets-perfect-scrollbar
|
2014-11-09 19:31:26 +01:00 |
|
Jonne Haß
|
9d967e9585
|
bump nokogiri
|
2014-11-09 19:30:52 +01:00 |
|
Jonne Haß
|
96c7624d82
|
bump guard-cucumber
|
2014-11-09 19:26:47 +01:00 |
|
Jonne Haß
|
a050d1bbba
|
bump gon
|
2014-11-09 19:26:03 +01:00 |
|
Jonne Haß
|
0bd6ecd666
|
bump factory_girl_rails
|
2014-11-09 19:25:14 +01:00 |
|
Jonne Haß
|
f42d519e51
|
bump devise
|
2014-11-09 19:24:23 +01:00 |
|
Jonne Haß
|
f890121b8f
|
bump sass-rails
|
2014-11-09 19:23:21 +01:00 |
|
Jonne Haß
|
30de98cf3e
|
Merge pull request #5335 from svbergerem/paginate-contacts
Paginate contacts
|
2014-11-09 19:04:07 +01:00 |
|
Jonne Haß
|
7e46502bf9
|
Merge pull request #5353 from goobertron/ac_removal_mail
Reword account removal email notification
|
2014-11-09 18:58:19 +01:00 |
|
Jonne Haß
|
404a286588
|
Merge pull request #5355 from Chocobozzz/header-logo-hover
Replace the black header logo with the white logo on hover
|
2014-11-09 18:55:59 +01:00 |
|
Jonne Haß
|
c7c57d40f5
|
Merge pull request #5380 from Faldrian/feature/3098-publisher-imageupload-layouterror-fix
Feature/3098 publisher imageupload layouterror fix
|
2014-11-09 18:52:13 +01:00 |
|
Jonne Haß
|
a3a8a22844
|
Merge pull request #5386 from denschub/camo
Add Camo support
|
2014-11-09 18:48:39 +01:00 |
|
Dennis Schubert
|
4c98445f1c
|
Fix presenters instead of modifying the getters
|
2014-11-09 07:47:40 -08:00 |
|
Dennis Schubert
|
6808150920
|
Method calling convention and doc improvements
... and a stealth-commit of an already introduced bug prevention system.
;)
|
2014-11-09 07:20:30 -08:00 |
|
Dennis Schubert
|
fd63fca7d5
|
Add Camo to MessageRenderer#markdownified
for mobile views
|
2014-11-09 07:29:36 +01:00 |
|
Dennis Schubert
|
df4063fd45
|
Documentation improvements and changelog entry
I just assume camo is cool enough to get an own section.
|
2014-11-09 06:51:17 +01:00 |
|
Dennis Schubert
|
a4a63c4c85
|
A little bit of cleanup
|
2014-11-09 02:27:17 +01:00 |
|
Dennis Schubert
|
5bcd5087bf
|
Add Camo for remote images
|
2014-11-09 02:17:43 +01:00 |
|
Dennis Schubert
|
5c9cc49363
|
Only RegEx if there is something to RegEx
|
2014-11-09 02:16:28 +01:00 |
|
Dennis Schubert
|
db2560d7fc
|
Add Camo for OpenGraph images
|
2014-11-09 01:36:16 +01:00 |
|
Dennis Schubert
|
89ad5b96ad
|
Add Camo for a profiles bio and location
yes, we do have Markdown there. But please don't tell anyone.
|
2014-11-08 23:12:55 +01:00 |
|
Dennis Schubert
|
0a619749f2
|
Add Camo for profile images
|
2014-11-08 23:12:55 +01:00 |
|
Dennis Schubert
|
613f2d1142
|
Add Camo for comments
|
2014-11-08 23:12:55 +01:00 |
|
Dennis Schubert
|
cca0c9eec4
|
Some refactorings, safer regex
|
2014-11-08 23:12:45 +01:00 |
|
Dennis Schubert
|
92cd4e6b78
|
Use camo for Markdown images
just a quick proof of concept
|
2014-11-08 05:14:18 +01:00 |
|
Dennis Schubert
|
9024d1a9b7
|
Add Camo configs
|
2014-11-08 05:14:18 +01:00 |
|
Faldrian
|
db13811c2c
|
added scrollbar to bookmark publisher, fixed mention layout bugs
|
2014-11-07 19:17:54 +01:00 |
|
Florian Staudacher
|
c7f4051ac0
|
Merge branch 'roymckenzie-body-classes' into develop
|
2014-11-07 16:41:53 +01:00 |
|
Florian Staudacher
|
2c8bbd3343
|
Merge branch 'body-classes' of https://github.com/roymckenzie/diaspora into roymckenzie-body-classes
|
2014-11-07 16:39:33 +01:00 |
|
Faldrian
|
ba551f6ac4
|
edit changelog
|
2014-11-07 16:37:52 +01:00 |
|
Faldrian
|
d928c69e36
|
Fix: displaying more than one row of image attachments broke publisher
|
2014-11-07 16:37:52 +01:00 |
|
Jason Robinson
|
cd4502f476
|
Merge pull request #5309 from svbergerem/confirm-unload-publisher
Ask for confirmation when leaving a submittable publisher
|
2014-11-06 22:44:02 +02:00 |
|
Steffen van Bergerem
|
25e4e558c5
|
Ask for confirmation when leaving a submittable publisher
|
2014-11-02 01:49:33 +01:00 |
|
Jonne Haß
|
aab1e4b5b1
|
Merge branch 'hotfix/0.4.1.2' into develop
Conflicts:
Changelog.md
Gemfile
Gemfile.lock
config/defaults.yml
|
2014-10-30 21:36:46 +01:00 |
|
Jonne Haß
|
7000f39881
|
bump Rails to fix CVE-2014-7818
|
2014-10-30 21:29:16 +01:00 |
|
Jonne Haß
|
62f1015d77
|
Merge pull request #5368 from strivedi183/5194-replace-jqueryhotkysjs-vendored-asset-with-bower-package
Replaced jquery.hotkeys.js vendored asset with a bower package #5194
|
2014-10-23 11:25:13 +02:00 |
|
Sandip Trivedi
|
722112314b
|
Replaced jquery.hotkeys.js vendored asset with a bower package #5194
|
2014-10-23 01:12:26 -04:00 |
|
Jonne Haß
|
3c808142fb
|
let default sidekiq config actually process the maintenance queue
|
2014-10-22 23:23:14 +02:00 |
|
Chocobozzz
|
e411a344f4
|
Commit the new branding sprite
|
2014-10-21 17:14:25 +02:00 |
|
Jonne Haß
|
6176502627
|
Merge pull request #5365 from zikalify/librejs_headers
Librejs headers
|
2014-10-21 17:08:01 +02:00 |
|
Paul Hill
|
fa9989cecf
|
change x11 to expat license
|
2014-10-21 15:42:21 +01:00 |
|
Paul Hill
|
f3d1176354
|
Added more LibreJS support
|
2014-10-21 15:39:02 +01:00 |
|
Jonne Haß
|
86a53b48ca
|
Merge pull request #5320 from zikalify/librejs_headers
Librejs headers
|
2014-10-21 10:20:38 +02:00 |
|
Paul Hill
|
ac4607d75c
|
LibreJS should work with most of the site
|
2014-10-21 02:48:18 +01:00 |
|
Jonne Haß
|
954627c16c
|
Merge pull request #5359 from goobertron/ac_close_text
Ka-BOOM! Fixes #5358
|
2014-10-20 21:35:59 +02:00 |
|
goobertron
|
4b7761e52a
|
Clarify explanation of account deleteion process
|
2014-10-20 20:15:38 +01:00 |
|
Chocobozzz
|
1aff0d8c2c
|
Add header logo when hoovered (white logo)
|
2014-10-18 22:24:05 +02:00 |
|
goobertron
|
797f7eae8d
|
Reword account removal email notification
|
2014-10-17 14:49:25 +01:00 |
|
Jonne Haß
|
ea97258f8e
|
Merge pull request #5352 from AugierLe42e/gitignore-adds
Added files in .gitignore
|
2014-10-17 13:29:40 +02:00 |
|
Augier
|
0a0272e08b
|
Added files in .gitignore
|
2014-10-17 13:08:37 +02:00 |
|