Commit graph

15532 commits

Author SHA1 Message Date
Jonne Haß
e7b92c15e2 Replace export_photos and export_users by export queue 2015-03-06 00:38:16 +01:00
Jonne Haß
25364893b9 Drop a few unused dot files [ci skip] 2015-03-05 23:04:58 +01:00
Jonne Haß
26cda1b1c5 Merge pull request #5724 from AugierLe42e/comment-design
Changed color border on active text
2015-03-04 11:52:09 +01:00
Jonne Haß
abc4203840 Merge pull request #5685 from margori/1802_export_photos
Export user photos
2015-03-04 01:45:51 +01:00
Marcelo Briones
b154d87070 Exports user photos as zip file 2015-03-03 19:45:57 -03:00
Augier
5be2fbafab Changed color border on active text" 2015-03-03 21:18:53 +01:00
Jonne Haß
ba7f0cf2ed Merge pull request #5719 from jhass/database_rewinder
Try to make Travis faster again
2015-03-02 19:19:53 +01:00
Jonne Haß
1a7988caaa Drop asset cache and precompilation on Travis again 2015-03-02 15:32:36 +01:00
Jonne Haß
0f2d2bd44d Replace DatabaseCleaner with DatabaseRewinder 2015-03-02 15:02:57 +01:00
Jonne Haß
15dd1b6bca Merge pull request #5714 from delftswa2014/5631-broken-people-preview
Fix for issue #5631
2015-03-02 13:12:33 +01:00
Selman Ercan
35fe6bda68 Issue #5631. Made top and left coordinates of hovercards match those of their parents.
Added line to changelog for bug fix of issue #5631.

Processing the 'mouseleave' event only if we've left both the parent and the hovercard.

Fixed indentation.

Replaced issue id with pull request id and fixed indentation.
2015-03-02 09:41:29 +01:00
Jonne Haß
dd45b79a98 Drop Youtube oembed HTTPS hack
upstream ships it now that way
2015-03-02 02:34:51 +01:00
Jonne Haß
c9729d66d6 Explicitly set log level for production environment 2015-03-02 01:34:50 +01:00
Jonne Haß
66f8503740 Merge pull request #5715 from svbergerem/bootstrap-port-streams
Port stream views to Bootstrap
2015-03-02 01:00:10 +01:00
Steffen van Bergerem
0c7d319fdc Remove unused css files 2015-03-02 00:04:58 +01:00
Steffen van Bergerem
e188782a9a Remove blueprint code 2015-03-02 00:04:57 +01:00
Steffen van Bergerem
c838389b67 Fix invitations and tests 2015-03-02 00:04:56 +01:00
Pablo Cuadrado
56a79828bc using circled help icon 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
3721861c94 border on the left of the stream and profile header 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
b0a8ecf8be margin 0 was messing up the left bar 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
2fb594735e main stream widths with fluid container 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
c402c65f56 unprefixing opacity 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
52fef10bea lame BR removed 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
75480c5454 using entypo on the right section, better alignment and styles 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
ba9bb619e4 using container instead of container fluid for the stream, we can manage this
better when migrating to Bootstrap 3
2015-03-01 12:04:54 +01:00
Pablo Cuadrado
84739a86d1 invite code box fix 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
9cbc09316d text shadow made the buttons look blurry 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
b23c0f7ae4 ensuring that the oembed element has the same size of the thumb 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
7f2ee4bf3d dropping blueprint option on publisher 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
24fdf8fb84 rightbar invitations ported to bootstrap 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
b2e3866217 removing blueprint classes from new aspect modal 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
122fde9093 colliding style removed 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
cfff769152 comment button using bootstrap styles 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
bb18803665 welcome to diaspora styles ported 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
cb99ad9e68 left bar styles adjusted 2015-03-01 12:04:51 +01:00
Pablo Cuadrado
e48679affe removing a missing mixing, using row instead of row-fluid 2015-03-01 12:04:51 +01:00
Pablo Cuadrado
c4fda4b563 main_stream ported, no further styling applied 2015-03-01 12:04:51 +01:00
Jonne Haß
a3cc24eced Cache sprites on Travis 2015-02-28 18:43:54 +01:00
Jonne Haß
51f2bd64ef Merge pull request #5713 from Flaburgan/tooltip-class
Add tooltip style on post report icon
2015-02-28 18:04:07 +01:00
flaburgan
741a24bc08 Add tooltip style on post report icon 2015-02-28 16:57:41 +01:00
Jonne Haß
93e8ed0ac5 Merge pull request #5712 from jhass/ci_precompile
Precompile assets on Travis
2015-02-28 15:08:26 +01:00
Jonne Haß
3ebd838d9d Try caching precompiled assets 2015-02-28 13:07:35 +01:00
Jonne Haß
4d540ce715 Precompile assets on Travis 2015-02-28 12:56:03 +01:00
Jonne Haß
8dd313efc6 Merge pull request #5711 from svbergerem/update-markdown-it-plugins
Update markdown-it-diaspora-mention and markdown-it-sanitizer
2015-02-28 12:42:05 +01:00
Steffen van Bergerem
687cbf4954 Update markdown-it-diaspora-mention and markdown-it-sanitizer 2015-02-28 05:21:58 +01:00
Dennis Schubert
ab4e04e8c4 Don't specify file extensions in SCSS imports 2015-02-28 05:04:39 +01:00
Dennis Schubert
dfedb82ebd Merge pull request #5710 from jhass/rename_scss_files
Remove .css extension from SCSS files
2015-02-28 04:00:25 +01:00
Jonne Haß
c96834bdf2 Remove .css extension from SCSS files
sass-rails 5.0 deprecated those
2015-02-28 03:37:46 +01:00
Jonne Haß
89d58f3fcb Merge pull request #5709 from diaspora/update_gems
Update gems
2015-02-28 03:36:00 +01:00
Jonne Haß
74eb3daba0 bump domain_name 2015-02-28 02:36:15 +01:00