Commit graph

105 commits

Author SHA1 Message Date
Augier
2e175c4be5 Bump to jQuery 2 2016-08-07 16:14:52 +02:00
Steffen van Bergerem
e0226f9322
Raise on missing translations 2016-07-03 20:15:57 +02:00
Steffen van Bergerem
b1943f1e46
Redesign default.haml and add a podmin welcome page 2016-06-20 02:03:53 +02:00
theworldbright
3734e074a6 Fix pronto errors 2016-01-04 16:49:52 +09:00
theworldbright
bc5e5c7420 Fix pronto errors 2016-01-04 16:49:51 +09:00
augier
031679762a Redesign the models 2016-01-04 16:49:49 +09:00
Augier
73cc55940d Fix travis errors and refactor 2016-01-04 16:49:49 +09:00
Augier
c6eb722517 Replace ERB by HAML, added locales, corrected Gemfile 2016-01-04 16:49:49 +09:00
theworldbright
efdfe318fd Add ability to get user info from access tokens 2016-01-04 16:48:42 +09:00
Augier
a1f3d5f5f9 Getting token from user credential flow 2016-01-04 16:45:21 +09:00
Steffen van Bergerem
b3a5e92eca Remove all faceboxes 2015-06-15 14:09:24 +02:00
Jonne Haß
8a6706337a Merge branch 'stable' into develop 2015-06-15 13:47:01 +02:00
Benjamin Neff
beb06bc42d precompile images from facebox gem
regression from #6005

closes #6105
2015-06-15 13:46:07 +02:00
efstrian
69c3a4100d Issue #4297: Color themes can override bootstrap variables 2015-06-07 19:58:54 +03:00
efstrian
57d766346c Issue #4297: Enable color theme setup 2015-06-07 19:57:16 +03:00
Augier
207b6c6153 Port to Bootstrap 3
correcting images display on stream sidebar

Corrections on profile page
2015-06-04 18:05:43 +02:00
Jonne Haß
179654071b Move default_url_options to application.rb
Apparently the subclasses got loaded before the initializers
were run, thus not inheriting the config.
2015-04-01 14:59:07 +02:00
Jonne Haß
e274470d55 Replace default.html with a regular view
So we can correctly reference the images
2015-03-28 23:12:07 +01:00
Steffen van Bergerem
84a5992a42 Refactor css code, remove unused code 2015-03-13 01:41:14 +01:00
Steffen van Bergerem
4f4dfc7554 Fix missing assets bug 2015-03-11 19:18:05 +01:00
Steffen van Bergerem
e188782a9a Remove blueprint code 2015-03-02 00:04:57 +01:00
Jonne Haß
a0c22659d5 Monkey patch to prevent dumping limit on boolean fields 2015-02-27 17:00:41 +01:00
Jonne Haß
162303db37 Enable Rails 5 behavior for exceptions in after_commit callbacks 2015-02-27 16:58:39 +01:00
Jason Robinson
9282a4ea8f Refactor mobile javascript to get rid of console errors.
Fixes also mobile bookmarklet services.
2015-01-17 15:50:06 +02:00
Lukas Matt
4d14e7d3ba Add jsxc to assets list 2014-11-13 11:22:22 +01:00
Sandip Trivedi
d7e8e2ce2c Replaced jquery.textchange.js vendored asset with a bower package #5194 2014-10-06 18:54:50 -04:00
Jonne Haß
d75632401b make everything boot again 2014-08-23 16:34:00 +02:00
Steffen van Bergerem
022bc1007d Remove unused code 2014-08-16 11:47:31 +02:00
arlogn
2394c3df39 flexible font-size for sign_in podname huge text 2014-07-06 19:18:21 +02:00
Florian Staudacher
13b716a449 allow admins to close user accounts from the backend
* thanks to @maxwell for the initial work on this

port admin pages to bootstrap
* improve user view on admin search page
* add 'close account' link to each user in the search results
* keep the same blue color for the admin menu

some refactoring of the routes and the admin code
* try to be more RESTful (possibly)
* use a 'UserSearch' model for search parameters and querying

add changelog entry
2014-07-01 23:33:15 +02:00
flaburgan
67d71e2280 Fix drawer in some mobile browsers.
Remove the black background on menu badges.
Fix body content on screen width > 768px.
Start split of mobile css in different files in /mobile/
2014-02-24 23:30:57 +01:00
flaburgan
820fa4e9b2 Extract and factorize the header css in a new file, fix ugly registration header design 2013-08-11 20:18:40 +02:00
flaburgan
ac533f8383 Refactor the left bar side menu, improve tag autosuggestion design, close #4271 2013-08-06 18:30:24 +02:00
carolina
143a970e61 Added strong_parameters gem to Gemfile and created an initializer in config 2013-08-02 11:39:05 +02:00
Jonne Haß
c6d158bd81 move asset_sync require to the earliest point possible 2013-06-13 20:57:38 +02:00
Jonne Haß
dfef6ee598 Do not load environment when precompiling assets 2013-06-13 20:57:10 +02:00
Jonne Haß
ac147cc9f4 Refactor config/ directory
* Get rid of early pathname requirement
* Use require_relative where approciate
* Drop unused files
* Imported new application.rb, environment.rb and environments/* from fresh Rails app
* Cleaned up boot.rb
* Load config in boot.rb
* Deduplicate environments/integration*.rb
* Move username blacklist into defaults.yml
* Ruby 1.9 Hash syntax everywhere
* Reorganize lib/diaspora/markdownify to match conventions
* Get rid of full path requires where possible
* Add dummy content to production section diaspora.yml.example to prevent warning
* Drop sqlite? method
* Move postgres? method into ConfigurationMethods
* Drop token authentication from User
2013-05-19 18:54:54 +02:00
Braulio Martinez
00a3332013 Remove unnecessary ruby187 hacks 2013-05-02 10:07:30 -03:00
Jonne Haß
be470784c5 add app directory to the autoload paths so that the worker files are loaded in development mode too 2013-04-04 23:32:11 +02:00
Jonne Haß
3fc3b249e7 End the require mess
* Rename and reorganize post fetcher to fix autoloading, also let it use
  Faradays default connection so we get nice redirects
* Add initializer to load libs at a central place
* added lib dir to autoload_once paths to increase thread safety
* Moved lib/exceptions.rb to lib/diaspora/ to conform namespacing
2013-03-21 23:37:53 +01:00
Blaž Hrastnik
d3f5f34fa0 Load the entire lib folder refactor.
Removed hack, replaced with a proper solution.
2012-12-30 13:08:16 +01: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ß
234b76a936 properly integrate asset_sync 2012-09-26 20:23:45 +02:00
Jonne Haß
e05c6e8897 drop heroku, heroku_san and associated rake tasks and files 2012-09-26 20:21:20 +02:00
Florian Staudacher
ea8f358a9a use unminified jQuery textchange plugin 2012-07-10 17:58:34 +02:00
Florian Staudacher
acc62e7380 forgot to put new css file in precompile list [ci skip] 2012-06-12 13:19:05 +02:00
Steven Hancock
87ceabc0ba Precompile Rails Admin assets
Rails Admin adds its CSS and Javascript assets to the asset pipeline
in an initializer, which doesn't run if config.assets.initialize_on_precompile
is disabled. This manually adds those assets in config/application.rb to make
sure they get precompiled on each deploy.

See 579785c120
2012-04-25 04:50:46 -07:00
Jonne Haß
579785c120 do not load the whole env to precompile assets [ci skip] 2012-04-20 23:56:52 +02:00
Steven Hancock
7e517c2636 Initialize on asset precompile
This re-enables 'config.assets.initialize_on_precompile' to allow the
Rails Admin assets to precompile. On Heroku deploys, this may require
the Heroku Labs 'user_env_compile' feature to be enabled, which you
should be using anyway for Asset Sync to work properly. :)
2012-04-13 20:42:05 -07:00
Steven Hancock
021cc99492 bootstrap-sass
Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2
from the bootstrap-sass gem.

I had to modify layouts/application to get the stream page to render properly,
looks like a slight conflict between Bootstrap and Blueprint grid systems, with
.span-24 instead of .row I was seeing the whole right bar dropped to the bottom
of the page below the left bar.

I also modified two other templates since Bootstrap 2.0.2 includes a "badge"
class that was making our navbar badges look funny. :)
2012-04-11 06:16:01 -07:00