a54260b517
use minimum-scale=1.0
2014-03-25 23:35:55 +01:00
80481a1e41
Merge branch 'master' into mobile-header
2014-02-21 12:46:09 +01:00
d466458469
restrict zooming in to not mangle layout accidentally
2014-02-20 17:37:48 +01:00
3f6d14be85
Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core
...
Conflicts:
core/css/styles.css
2014-02-20 14:29:23 +01:00
92d57cb5a7
move avatar into clickable area of user menu
2014-02-20 13:36:52 +01:00
17c00f34d3
Add alt attribute for img elements
2014-01-10 10:19:08 +01:00
3ae17d0785
Fix unallowed child elements
2014-01-10 10:17:19 +01:00
dc45141f4a
Merge pull request #6262 from nickvergessen/issue/4375
...
correctly mark app management active
2013-12-20 02:27:52 -08:00
009e25788f
correctly mark app management active
2013-12-09 15:53:31 +01:00
1dc9998920
Remove reference to ownCloud.
2013-12-05 17:01:51 -05:00
e7748613ef
Link to enable-javascript.com
2013-12-05 12:06:20 -05:00
1687ec0cd2
Make noscript message translatable
2013-12-05 09:52:13 -05:00
bdab0409c4
Add overlay noscript message to fix #6032
2013-12-05 09:19:46 -05:00
e7603aa6b4
Updates ownCloud title to Application - ownCloud
2013-10-17 14:10:06 +05:30
f8c865993f
Fixed viewport layout using commas instead of semicolons
...
Fixes #5285
2013-10-11 12:52:34 +02:00
5144def99b
Moved Core Theme Logos to CSS
...
In order to make it easier for a user/developer to replace logos in the core theme, I removed the hardcoded `logo.svg` and `logo-wide.svg` from the html, and replaced them with `div`s that use css background-image instead.
This has multiple advantages:
1. The user can now use any filename they want for the logo. They are no longer forced to use logo.svg or logo-wide.svg.
2. The user can now easily use a JPG, PNG or GIF logo instead of SVG (SVG's are awesome, but used by an unfortunately small percentage of web developers at the current time. Most probably don't even know how to make an SVG…).
3. The user doesn't have to resort to hacking the core theme template files in order to use a different filename or file type.
4. Greatly simplifies documentation instructions for how to change the logos (http://owncloud.org/theming/ ).
Signed-off-by: Jake Wilson <jakew@huebnerpetersen.com>
2013-10-10 12:29:13 -06:00
d968843bf6
Merge pull request #5244 from owncloud/more-css-fixes
...
More css fixes
2013-10-10 04:48:11 -07:00
131d82e41e
move call to print_unescaped() to template
2013-10-07 11:49:43 +02:00
94ae66c651
fix web interface showing very small when accessed on smartphone
2013-10-06 22:50:11 +03:00
493e948146
$defaults is not necessary here - merge artifact
2013-10-02 00:34:13 +02:00
173f32e6ef
Revert "use $defaults instead of $theme"
...
This reverts commit d5038e93db
2013-10-02 00:32:11 +02:00
d5038e93db
use $defaults instead of $theme
2013-10-01 14:33:56 +02:00
d8ada370d7
Squashed commit of the following:
...
commit ae1f68ac54cf2878d265b2bbce13bd600d2d0719
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu Aug 22 11:45:27 2013 +0200
fixing undefined variable
commit 982f327ca10eea0a2222eae3e74210648591fd8a
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 12:00:14 2013 +0200
adding login.php as alternative for index.php/login
commit da0d7e1d096fb80789524b01f0f96fe08d147943
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 11:36:12 2013 +0200
adding a route for web login
commit 8e2a01160485cf7e9a2eb8bf46f06fae73956e8e
Author: Karl Beecher <karl@endocode.com>
Date: Tue Aug 6 17:00:28 2013 +0200
Login attempt returns true instead of exiting immediately
commit fd89d55de9e71e986e03a0de9aad9407b632e22f
Author: Karl Beecher <karl@endocode.com>
Date: Mon Aug 5 15:31:30 2013 +0200
Further abstraction.
This change introduces the ApacheBackend interface for backends that
depend on Apache authentication and session management. There are no
longer references to specific backends in OC_User.
commit 469cfd98aea5a37985722cf5f9e00ece0ce38178
Author: Karl Beecher <karl@endocode.com>
Date: Thu Aug 1 15:46:36 2013 +0200
Make login attempt function protected.
commit d803515f19ff086e2028fcaa51afae579685e596
Author: Karl Beecher <karl@endocode.com>
Date: Wed Jul 31 16:00:22 2013 +0200
Amends the login link
When using a Shibboleth login, clicking logout displays a message to the
user instead of ending the session.
commit aa8c1fcea05c8268f26a10b21c4e0bc547c3414f
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 13:15:59 2013 +0200
Abstract Shibboleth authentication into an Apache authentication method
commit 69082f2ebcab267f6e8eceb1a252f84c52236546
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 11:22:26 2013 +0200
Convert spaces -> tabs
commit 5a80861d86855eec5906fd5e235ac4ff12efb0f2
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:40:48 2013 +0200
Separate the authentication methods
SABRE authentication and base authentication have slightly different
workings right now. They should be refactored into a common method
later, but time pressure requires us to reinvent the wheel slightly.
commit dc20a9f8764b103b7d8c5b713f2bcdae18708b65
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:07:07 2013 +0200
Authenicate calls to WebDAV against Shibboleth.
When using WebDAV, the OC_Connector_Sabre_Auth::authenticate method is
normally called without trying the Shibboleth authentication... thus the
session is not established.
The method now tries Shib authentication, setting up a session if the
user has already authenticated.
commit 091e4861b2246c4084c9b30e232289fde4ba1abf
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 14:04:54 2013 +0200
Sets up the Shibboleth login attempt.
commit bae710ec0579ef99b23022cc12f6876c5fe6b0d5
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 12:36:44 2013 +0200
Add a method for attempting shibboleth login.
If the PHP_AUTH_USER and EPPN environment variables are set, attempt a
Shibboleth (passwordless) login.
commit 667d0710a7854e58fb109201d9cee6ec064e793a
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:38:04 2013 +0200
Revert "Adds the apps2 folder with user_shibboleth backend."
This reverts commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef.
commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:28:06 2013 +0200
Adds the apps2 folder with user_shibboleth backend.
Conflicts:
core/templates/layout.user.php
lib/base.php
2013-10-01 14:29:01 +02:00
bf7f94422f
Bring another enable_avatars to $_ and fix $thus->$this
2013-09-11 07:11:33 +02:00
a1e7614d73
Clean up oc_avatars
2013-09-04 12:56:14 +02:00
b1d20e0470
Have the header avatar to the left of the user name
2013-09-03 21:44:32 +02:00
76b1b5b6a3
Provide 'enable_avatars' in config.php, to disable avatars
2013-09-01 18:17:14 +02:00
5d653753bd
Merge branch 'master' into oc_avatars
2013-08-31 12:56:36 +02:00
c9c4ab22a4
Apps management as sticky footer and rename to 'Apps', fix #4622
2013-08-30 11:17:31 +02:00
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
e6473e6d49
Clean up some cruft
2013-08-26 17:41:19 +02:00
252548c62c
Improve styling & enable avatar-upload at personal page
2013-08-25 21:04:45 +02:00
4a08f7d710
Add basic avatars and gravatar
2013-08-25 21:02:43 +02:00
367b248bc0
show 'More apps' link to app administration directly in app navigation
2013-08-07 18:18:09 +02:00
75fd6d4fde
initialize OC_Defaults in template constructorX
2013-07-24 11:51:21 +02:00
aacca494c5
introduce shortname themable string and split from title, use for image alt text
2013-07-11 16:38:07 +02:00
3c691c9ec9
move to non-static OC_Defaults
...
Conflicts:
lib/mail.php
2013-07-04 10:11:16 +02:00
d46e62886a
Add init funtion to OC_Defaults to be able to wrap translatable strings
2013-07-04 10:09:28 +02:00
d97d00fe0f
add logo claim to defaults.php
2013-07-01 10:48:13 +02:00
aaefa157fd
hide the logo claim in case the theme is not loaded
2013-06-17 20:35:08 +02:00
2141c41d0d
add logo-claim
2013-06-12 17:20:09 +02:00
b29e01d5cf
keep all strings in one place to make it easier to change them
2013-06-12 15:15:08 +02:00
7c108edc36
mage page title aware of ownCloud edition
2013-06-12 14:33:24 +02:00
1d720099c3
Merge pull request #3179 from pawl/patch-1
...
Improve IE Compatibility
2013-05-28 05:18:43 -07:00
63d51980e1
Get config from template
2013-05-12 10:51:21 +02:00
215264706d
Improve IE Compatibility
...
Added meta tags from HTML5 Boiler Plate to improve compatibility with IE7+. This fixes the issues with rendering.
2013-04-29 15:44:11 -05:00
e3c9554856
Reword sentence and move HTML out of translation
2013-04-29 00:13:23 +03:00
b6fee2d257
Remove uneeded link
2013-04-24 22:39:04 +03:00
d41b600725
Add an update notification on every page for admin users
2013-04-24 18:47:38 +02:00
000a568b4a
Long Application Names are ellipsis correctly.
2013-04-10 19:14:50 +05:30
76bb5221c7
Restores keyboard accessibility for expandable settings area.
...
Tabindex="0" makes the element focussable with the keyboard and
role="link" tells assistive technologies that this clickable span
element is supposed to be presented as a hyperlink.
2013-03-16 16:32:55 +01:00
9cb5bf0a28
add ie css switch to layout templates
2013-03-03 13:57:20 +01:00
050de008b1
Avoid to display empty DisplayNames for menu and title
2013-03-02 16:09:36 +01:00
229c907a57
[core] From echo to p
2013-02-27 22:55:39 +01:00
69eb69be0e
Merge pull request #1902 from owncloud/angularcsp
...
add CSP turned on for angularjs
2013-02-26 00:58:12 -08:00
195b52cb63
Merge branch 'master' of github.com:owncloud/core into issue_1776
...
Conflicts:
core/templates/layout.user.php
2013-02-25 17:16:03 -05:00
b537cecdf3
add CSP turned on for angularjs
2013-02-25 22:54:05 +01:00
6735701c1e
Merge pull request #1837 from owncloud/fix-user-template
...
Remove unneeded code for user layout template
2013-02-25 13:41:32 -08:00
c111a3aa24
add span tag to displayname on expand button
2013-02-25 15:40:57 -05:00
bf0b9bac8b
Remove unneeded code for user layout template
2013-02-22 00:22:43 +01:00
59582e0f3f
Fix review issues
2013-02-22 00:21:06 +01:00
1a747b3e48
Style cleanup core dir
2013-02-21 23:47:21 +01:00
b8e2454f68
Fix strict standard warning in user template
2013-02-15 16:10:06 +01:00
ac32ae79af
Merge pull request #1683 from owncloud/ie-fixes
...
IE fixes
2013-02-15 03:32:31 -08:00
c7094197bf
Sanitize HTML
2013-02-14 18:15:14 +01:00
f9a6ed6c73
fix navigation icons SVG replacement, also hover and active opacity for IE
2013-02-14 10:59:30 +01:00
217328e0e3
Merge pull request #1514 from owncloud/fix-setup
...
Fix setup
2013-02-07 13:48:44 -08:00
20b6cb28b1
Fix warning with displayname in user layout template
2013-02-07 18:07:27 +01:00
149d079fd4
Move loading of js_config to templatelayout
...
Also check for installed flag because this isn't available before setup
2013-02-07 08:09:53 +01:00
8ea6398e48
collapse user menu when inside one of the settings sections
2013-02-06 16:03:01 +01:00
45865b45c4
use translate string for Log out, remove title
2013-01-31 20:45:59 +01:00
6d560be564
fix svg fallback replacement for settings icons
2013-01-31 20:42:44 +01:00
228a181d48
use new user function to display real name if available, username still fallback
2013-01-30 18:35:53 +01:00
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
d19de49606
prevent xss
2013-01-29 22:32:59 +01:00
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
3b547895ec
Merge pull request #1306 from owncloud/smart-app-banner
...
add smart app banner to promote ios app
2013-01-26 04:00:57 -08:00
bc9ab0726e
add smart app banner to promote ios app
2013-01-25 16:05:16 +01:00
2fee1208ef
add display name to title instead if login-ID
2013-01-24 15:49:23 +01:00
5fff57339f
Move config to core/js/config.php
2013-01-21 00:10:47 +01:00
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
b81a7aa078
fix up content and content-wrapper merge ...
2013-01-18 19:58:50 +07:00
de41813792
new app icon style for new design
2013-01-17 11:54:31 +07:00
b7f507b925
dont resize content div with javascript but use css box-sizing to do it
2013-01-16 19:38:19 +01:00
c2b3c7ed3e
fixing text-align on navigation menu - closing div was missing - THX Lukas
2013-01-11 15:19:53 +01:00
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +01:00
b51b9539d0
Very simple js console switcher.
2012-11-15 19:43:10 +01:00
7a7f12a0c1
Create only one CSRF token per session
...
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)
With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
cf2a504d42
Merge branch 'master' into navigation
2012-10-28 14:10:10 +01:00
5245e2b6be
->l expects two parameters
2012-10-28 10:33:18 +01:00
2d5edead77
Revert "Fix a typo"
...
This reverts commit a306e4b8a0
2012-10-28 10:21:06 +01:00
a306e4b8a0
Fix a typo
2012-10-28 10:19:31 +01:00
fc280b2887
first move of settings to top right
2012-10-27 18:58:16 +02:00
b595ea6efc
first icon update. Next step: make sprited hover state (like for home already)
2012-10-27 17:44:24 +02:00
3eea7aac13
first base on navigation rework, less obtrusive, icons need to be updated, settings moved
2012-10-26 23:38:36 +02:00
41b597e179
Translate formatDate using jquery datepicker
2012-10-19 13:56:19 +02:00
a24d8db4b2
translate datepicker
2012-10-19 13:56:19 +02:00
71454b1bca
Fix to preserve backward compatibility for apps creating static links containing the request token (currently the contacts app and maybe some 3rd party implementations)
2012-09-28 18:57:20 +02:00
743826bbf3
Reimplementation of CSRF protection including autorefresh
2012-09-28 13:30:44 +02:00
df528cfe95
show the current username. This confused some people
2012-09-12 12:23:21 +02:00
edcd297476
Move handling of core remotes to OC_TemplateLayout
2012-09-07 16:42:46 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
6324daecc0
Don't wait for document ready for setting requesttoken
2012-08-30 23:10:24 +02:00
cc445e4e47
Small changes to allow updating main menu dynamically.
2012-08-05 01:42:17 +02:00
b1010160b3
CSRF protection for eventsource
2012-07-22 16:37:49 +02:00
a113ee9e9f
add x-webkit-speech to searchbox
2012-06-24 00:42:16 +02:00
e5c56b2433
Merge branch 'master' into multi_app_dir
...
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
2012-06-21 17:15:35 +00:00
34739b7ec5
use new sanitizeHTML() function
2012-06-21 13:57:18 +02:00
c3cd3f3571
CSS class headerAction -> header-action
2012-06-18 23:22:52 +02:00
4a50c15a8e
corrected header width and floating (can now dynamically add stuff to header); someone may test this in IE
2012-06-18 13:36:49 +02:00
4753cc3ebd
Merge branch 'master' into multi_app_dir
...
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
2012-06-14 21:16:59 +00:00
f0b87bc421
Make requesttoken global.
2012-06-14 18:13:01 +02:00
89464721c7
Added JSON methods for CSRF prevention. Make request token accessible from template and add js var.
2012-06-13 17:33:19 +02:00
4260dce826
Better handling of core.css and core.js
...
Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
2012-06-07 21:35:40 +02:00
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
cc494259d3
Unit path and webpath, correct some more
2012-06-06 20:24:15 +00:00
4a5973662c
Merge branch 'unstable'
...
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
2012-06-04 23:02:05 +02:00
ce1e4425c2
Combine and minimize core and default app js files
2012-05-16 18:53:46 +02:00
f71fec8cdc
Combine and minimize core and default app css files
2012-05-16 18:53:46 +02:00
198b73ddd1
Sanitize search queries, thanks to Lukas Reschke
2012-05-13 15:57:46 -04:00
27da29525a
Made the global settings icon accessable via keyboard.
...
Bug http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-561
2012-05-04 09:53:36 +02:00
051cb7d96b
show the username in the title. good idea.
2012-04-30 13:08:32 +02:00
a85d49833b
fix position of Semicolon
2012-04-24 21:52:44 +02:00
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +02:00
5868199e85
fixed settings hover, now whole row sensitive and fading not jerky
2012-04-15 13:34:30 +02:00
56bc2c4591
add a title attribute to the logout button
2012-04-12 20:34:56 +02:00
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
a25bda8e41
Add application name to title
2012-02-12 21:56:01 +01:00
82c7598861
Remove global vars and use the OC static version.
...
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
2011-09-18 19:37:54 +02:00
897bc55d46
Revert "Style searchbox like other textboxes"
...
The search box style is a design decision, search boxes are always styled differently from other inputs.
This reverts commit 9d48ca75ff
2011-08-27 20:02:11 +02:00
9d48ca75ff
Style searchbox like other textboxes
2011-08-27 13:42:03 -04:00
d9aae20003
more valid HTML, alt attributes, refactored pagenavi etc.
2011-08-20 05:07:58 +02:00
0db5c734bc
some header fixes
2011-08-19 22:53:07 +02:00
7bb261f810
more fixes for Personal and Tipsy
2011-08-14 16:12:31 +02:00
9be059aced
removed subnavigation code
2011-08-13 05:31:56 +02:00
99790d6805
lots of image changes, use svg EVERYWHERE POSSIBLE
2011-08-11 19:00:32 +02:00
a8cb411a92
restyle logout
2011-08-11 00:47:21 +02:00
05f3910718
moved search box directly to template
2011-08-10 22:56:55 +02:00
fbf86c6683
made sliding settings more awesome
2011-08-10 17:31:01 +02:00
9059b55979
make more strings translatable
2011-08-10 14:03:54 +02:00
44f3dfe771
added semantic meaning with header, nav and footer
2011-08-09 10:30:37 +02:00
5ed1030dbf
fixed icons
2011-08-08 23:39:16 +02:00
16bb34cd94
settings are now AWESOME
2011-08-08 23:32:09 +02:00
d1d47eb5eb
do proper styling for settings pages
2011-08-08 22:38:42 +02:00
e6f6d3dabc
dont use a different navigation page for settings stuff
2011-08-08 21:43:31 +02:00
4de7009014
removed gratuitous main div
2011-08-08 19:50:42 +02:00
a84b00cefc
fixing old CSS and HTML, navigation before content
2011-08-03 05:19:17 +02:00
04b745d67a
compacted sidebar
2011-08-02 02:03:14 +02:00
ef22498c6f
some fixes for persistent playlists
2011-08-01 01:59:57 +02:00
8426babab9
updated navigation subentry styling
2011-07-30 10:56:28 +02:00
d12d08e2f3
some more changes for navigation subentries
2011-07-29 19:43:06 +02:00
997e1f9743
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-07-29 12:26:30 -04:00
9f867abe75
Display subnavigation entries in user layout template
2011-07-29 12:25:57 -04:00
2781fdeed8
automatically replace svg images with png for browsers that dont support svg
2011-07-29 17:51:38 +02:00
c5bc345604
rewrote header in pure CSS, smaller, less obtrusive
2011-07-28 02:30:09 +02:00
9950f06c59
Merge branch 'master' into interface
2011-07-22 00:28:17 +02:00
828a26c69e
dont load some javascript files multiply times
2011-07-22 00:24:25 +02:00
be6b5c8e77
some work on the updated interface
2011-07-21 22:01:55 +02:00
4d11e920be
provide an option to add custom elements to the header of templates
2011-06-24 18:02:19 +02:00
91c37bbb76
moved core stuff to /core
2011-06-20 20:29:30 +02:00
Thomas Müller
Robin Appelman
Jan-Christoph Borchardt
Jörn Friedrich Dreyer
Joas Schilling
Frank Karlitschek
ringmaster
raghunayyar
Vincent Petry
Jake Wilson
Morris Jobke
kondou
Björn Schießle
Lukas Reschke
Paul Brown
Henning Oschwald
Brice Maron
Qingping Hou
Bernhard Posselt
Bart Visscher
Georg Ehrke
Thomas Tanghus
scambra
Christian Reiner
Christian Reiner
Florian Hülsmann
Michael Gapczynski
Frank Karlitschek
Jan-Christoph Borchardt
Frank Karlitschek
Marvin Thomas Rabe
Bart Visscher
Jan-Christoph Borchardt
Robin Appelman
Jakob Sack