Björn Schießle
2141c41d0d
add logo-claim
2013-06-12 17:20:09 +02:00
Björn Schießle
b29e01d5cf
keep all strings in one place to make it easier to change them
2013-06-12 15:15:08 +02:00
Björn Schießle
918906f042
make footer aware of ownCloud editions
2013-06-12 14:49:30 +02:00
Björn Schießle
7c108edc36
mage page title aware of ownCloud edition
2013-06-12 14:33:24 +02:00
Jörn Friedrich Dreyer
1d720099c3
Merge pull request #3179 from pawl/patch-1
...
Improve IE Compatibility
2013-05-28 05:18:43 -07:00
Thomas Tanghus
27a5132b46
Don't set image path in template.
2013-05-20 09:44:31 +02:00
Thomas Tanghus
a0b79f5649
Dialogs: Loose up-button.
2013-05-17 06:48:24 +02:00
Thomas Tanghus
152e275c8a
Various cleanups in OC.dialogs
2013-05-17 04:54:08 +02:00
Thomas Tanghus
c8bbf90feb
Port OC.dialogs to use octemplate except for prompt() and form().
...
Also load octemplate per default.
2013-05-16 13:41:04 +02:00
Lukas Reschke
739f799912
Add requesttoken to guest view
...
Should fix #3321
2013-05-13 14:23:56 +02:00
Lukas Reschke
63d51980e1
Get config from template
2013-05-12 10:51:21 +02:00
Paul Brown
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
Lukas Reschke
e3c9554856
Reword sentence and move HTML out of translation
2013-04-29 00:13:23 +03:00
Lukas Reschke
b6fee2d257
Remove uneeded link
2013-04-24 22:39:04 +03:00
Lukas Reschke
d41b600725
Add an update notification on every page for admin users
2013-04-24 18:47:38 +02:00
Jan-Christoph Borchardt
c8cafcefe4
move password warning more relevant below password field, un-nest log in warning
2013-04-17 17:16:15 +02:00
Bart Visscher
f3c06ae4e4
Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better
...
Handle empty datafolder better.
2013-04-17 00:44:14 -07:00
kondou
3ab97312b8
Hint to default data directory
...
not to before submitted data directory.
Thanks to bartv2 for the heads up.
2013-04-16 09:54:34 +02:00
kondou
d759dca203
Handle empty datafolder better.
...
If datafolder is erased, the default value will be shown as a placeholder.
If installation is submitted without a datafolder the default value will be used.
2013-04-13 15:56:01 +02:00
kondou
c6dbb33e15
Fix textfield label overlapping value.
2013-04-13 14:48:16 +02:00
raghunayyar
59be6a910c
Implements Toggle for Database Password.
2013-04-13 09:45:30 +05:30
raghunayyar
000a568b4a
Long Application Names are ellipsis correctly.
2013-04-10 19:14:50 +05:30
Lukas Reschke
68d55648d5
Show a warning in the installer if the used PHP version is vulnerable to the NULL Byte attack
2013-03-20 08:44:33 +01:00
Henning Oschwald
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
Lukas Reschke
630ee644db
Don't sanitize error message hint
2013-03-06 12:56:27 +01:00
Jan-Christoph Borchardt
07dee24cb2
explicitly add empty placeholder to inputs which use infield labels, fix #2049
2013-03-04 22:11:57 +01:00
Jörn Friedrich Dreyer
9cb5bf0a28
add ie css switch to layout templates
2013-03-03 13:57:20 +01:00
Brice Maron
050de008b1
Avoid to display empty DisplayNames for menu and title
2013-03-02 16:09:36 +01:00
Lukas Reschke
39e28c0170
Typo...
2013-02-27 23:19:38 +01:00
Lukas Reschke
6f14bec70a
Add a missing )
2013-02-27 23:15:18 +01:00
Lukas Reschke
229c907a57
[core] From echo to p
2013-02-27 22:55:39 +01:00
Lukas Reschke
40e51d13d2
Remove uneeded file
2013-02-27 22:35:37 +01:00
Frank Karlitschek
69eb69be0e
Merge pull request #1902 from owncloud/angularcsp
...
add CSP turned on for angularjs
2013-02-26 00:58:12 -08:00
Qingping Hou
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
Bernhard Posselt
b537cecdf3
add CSP turned on for angularjs
2013-02-25 22:54:05 +01:00
Lukas Reschke
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
Qingping Hou
c111a3aa24
add span tag to displayname on expand button
2013-02-25 15:40:57 -05:00
Thomas Mueller
9898ba4daf
Merge branch 'master' into master-sqlserver
...
Conflicts:
core/templates/installation.php
2013-02-22 22:59:09 +01:00
Jörn Friedrich Dreyer
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
Bart Visscher
bf0b9bac8b
Remove unneeded code for user layout template
2013-02-22 00:22:43 +01:00
Bart Visscher
59582e0f3f
Fix review issues
2013-02-22 00:21:06 +01:00
Bart Visscher
19c5213b53
Join split translated strings
2013-02-21 23:47:56 +01:00
Bart Visscher
1a747b3e48
Style cleanup core dir
2013-02-21 23:47:21 +01:00
Jan-Christoph Borchardt
e7d1bbfae3
fix giant advanced caret in installation
2013-02-21 18:20:14 +01:00
Thomas Mueller
2675290325
Merge branch 'master' into master-sqlserver
2013-02-18 11:39:04 +01:00
Robin Appelman
b8e2454f68
Fix strict standard warning in user template
2013-02-15 16:10:06 +01:00
Jan-Christoph Borchardt
ac32ae79af
Merge pull request #1683 from owncloud/ie-fixes
...
IE fixes
2013-02-15 03:32:31 -08:00
Thomas Mueller
4b80466880
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/db.php
lib/files/cache/cache.php
lib/files/cache/legacy.php
lib/setup.php
2013-02-14 22:54:48 +01:00
Bart Visscher
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
Jan-Christoph Borchardt
bb52271d22
exchange bright caret with dark triangle
2013-02-14 18:22:45 +01:00
Lukas Reschke
c7094197bf
Sanitize HTML
2013-02-14 18:15:14 +01:00
Jan-Christoph Borchardt
f9a6ed6c73
fix navigation icons SVG replacement, also hover and active opacity for IE
2013-02-14 10:59:30 +01:00
Jan-Christoph Borchardt
09d9138f84
fix caret on installation page for IE
2013-02-14 10:58:05 +01:00
Bart Visscher
d3ef967993
Fix indentation style
2013-02-14 08:36:26 +01:00
Thomas Mueller
76b31f870c
Merge branch 'master' into master-sqlserver
2013-02-12 00:32:38 +01:00
Administrator
41ec976fd7
Bugfixes and cleanup MS SQL Server installation
2013-02-10 13:07:59 +01:00
Jan-Christoph Borchardt
1ba44a3325
Merge pull request #1538 from raghunayyar/admin-password-toggle
...
Password Toggle Works on Installation
2013-02-10 02:38:43 -08:00
Jan-Christoph Borchardt
bebdd113f5
use proper HTML for other security warning too
2013-02-08 19:59:42 +01:00
Jan-Christoph Borchardt
a26e66b232
improve and shorten security warning, add link to docs, fix #1342
2013-02-08 13:38:50 +01:00
raghunayyar
eea4864c70
Removed whitespace from installation.php
2013-02-08 17:35:41 +05:30
raghunayyar
b356b7065f
Password Toggle Works on Installation as well.
2013-02-08 16:38:28 +05:30
Tobias Ramforth
d577f790c8
Added MS SQL Server support
2013-02-08 00:00:51 +01:00
Lukas Reschke
217328e0e3
Merge pull request #1514 from owncloud/fix-setup
...
Fix setup
2013-02-07 13:48:44 -08:00
Thomas Müller
867650ee47
Merge pull request #1529 from owncloud/installation-login-fixes
...
Installation login fixes
2013-02-07 13:40:25 -08:00
Jan-Christoph Borchardt
8ca730f4c1
make show password toggle work for installation (once #1525 is fixed)
2013-02-07 18:07:38 +01:00
Bart Visscher
20b6cb28b1
Fix warning with displayname in user layout template
2013-02-07 18:07:27 +01:00
Jan-Christoph Borchardt
32e739f2ae
make show password not specific to log in
2013-02-07 17:41:24 +01:00
Bart Visscher
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
Jan-Christoph Borchardt
4c406c9ab1
fix shorttag issue mentioned in #1357
2013-02-06 18:19:26 +01:00
Jan-Christoph Borchardt
09a4424b1f
Merge pull request #1497 from owncloud/collapse-usermenu
...
collapse user menu when inside one of the settings sections
2013-02-06 07:33:59 -08:00
Jan-Christoph Borchardt
8ea6398e48
collapse user menu when inside one of the settings sections
2013-02-06 16:03:01 +01:00
Thomas Müller
efdaea4557
Merge pull request #1357 from owncloud/alternative-loging-master
...
add support for apps to register alternative login methods
2013-02-06 06:49:58 -08:00
Jan-Christoph Borchardt
964ff88f71
move inline style to CSS file, fix details
2013-02-06 15:15:20 +01:00
raghunayyar
3bcf3c91e1
Password Toggle Support for Login
2013-02-03 11:56:00 +01:00
Jan-Christoph Borchardt
45865b45c4
use translate string for Log out, remove title
2013-01-31 20:45:59 +01:00
Jan-Christoph Borchardt
6d560be564
fix svg fallback replacement for settings icons
2013-01-31 20:42:44 +01:00
Jan-Christoph Borchardt
228a181d48
use new user function to display real name if available, username still fallback
2013-01-30 18:35:53 +01:00
Jan-Christoph Borchardt
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
Lukas Reschke
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
Björn Schießle
d19de49606
prevent xss
2013-01-29 22:32:59 +01:00
Thomas Mueller
825cdf8560
add support for apps to register alternative login methods
...
below the standard login a list of icons/button will be displayed
2013-01-29 17:28:08 +01:00
Jan-Christoph Borchardt
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
Thomas Mueller
1d44a99ebb
Merge branch 'master' into updater-CSP
...
Conflicts:
core/templates/update.php
2013-01-28 09:57:24 +01:00
Michael Gapczynski
0986b6f910
Use global oc_requesttoken for Event Source
2013-01-26 16:36:48 -05:00
Thomas Müller
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
Thomas Müller
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
Lukas Reschke
dbc13cf6ee
Move update inline JS
2013-01-25 19:18:16 +01:00
Georg Ehrke
bc9ab0726e
add smart app banner to promote ios app
2013-01-25 16:05:16 +01:00
Björn Schießle
2fee1208ef
add display name to title instead if login-ID
2013-01-24 15:49:23 +01:00
Lukas Reschke
846971ec11
Fix merge conflict
2013-01-23 11:33:25 +01:00
Lukas Reschke
fe56e4df7d
Fix merge conflict
2013-01-23 11:32:14 +01:00
Lukas Reschke
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
Michael Gapczynski
9eecb91338
Merge pull request #1113 from owncloud/fix-issue-1085
...
Fix rendering of database connection error page
2013-01-22 14:38:44 -08:00
Lukas Reschke
39da6f8166
Move timezone check to external JS
2013-01-21 21:10:44 +01:00
Lukas Reschke
5fff57339f
Move config to core/js/config.php
2013-01-21 00:10:47 +01:00
Thomas Mueller
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
Jan-Christoph Borchardt
b81a7aa078
fix up content and content-wrapper merge ...
2013-01-18 19:58:50 +07:00
Jan-Christoph Borchardt
de41813792
new app icon style for new design
2013-01-17 11:54:31 +07:00
Bernhard Posselt
b7f507b925
dont resize content div with javascript but use css box-sizing to do it
2013-01-16 19:38:19 +01:00
Bart Visscher
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00