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
823c85e65f
Merge pull request #6202 from owncloud/fix_6032_alt
...
Add overlay noscript message to fix #6032
2013-12-07 08:04:29 -08: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
1620015531
fix appearance of error message - .errors is outdated
2013-12-05 11:23:30 +01:00
587fc1aff3
Fix resize issue for trash button in chrome and overflowing spinner in .update class
...
fixes #6108
2013-11-28 21:36:43 +01:00
55d7cf8ffd
improve encryption message
2013-11-27 23:07:19 +01:00
0219b8b3b9
add spinner to the template so that it can be loaded in time
2013-11-27 22:36:47 +01:00
1536c7ea58
switch from "name" attribute to "id"
2013-11-27 17:01:21 +01:00
d6fb2afa85
show a message at the log-in screen if inital encryption take place
2013-11-25 23:49:05 +01:00
1bcb04f94e
Add template for single user mode message
2013-11-25 15:59:37 +01:00
02b92137b3
unify translation string - less work for the translators
2013-11-21 09:58:35 +01:00
3a81c8e3af
Changed update message to be more instructive, changed update style to be less aggresive
...
Fix br tags
Improve english messages
2013-10-24 19:21:40 +02:00
20716a153a
fix message dialog titles in IE8
2013-10-23 10:58:25 +02:00
148d2616e5
introduce link_to_docs() and migrate links
2013-10-21 21:29:45 +02:00
e7603aa6b4
Updates ownCloud title to Application - ownCloud
2013-10-17 14:10:06 +05:30
e6d034a60b
Merge pull request #5290 from owncloud/fixing-5191-master
...
Installation. Show advanced section on error. Fixes #5191
2013-10-12 03:28:44 -07:00
46dd273b9c
Merge pull request #5287 from owncloud/core-layoutviewportdirective
...
Fixed viewport layout using commas instead of semicolons
2013-10-12 01:36:20 -07:00
a2445888e8
Show advanced section on error. Fixes #5191
2013-10-11 14:48:31 +03:00
31714f8871
Merge pull request #5133 from owncloud/js_vcategories_to_tags
...
Js vcategories to tags
2013-10-11 04:17:59 -07:00
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
b48dffa9a3
Merge pull request #5072 from owncloud/apache-auth-master
...
OC6 Apache Authentication
2013-10-07 06:29:56 -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
08e1147a6b
Merge pull request #4982 from syncloud/master
...
Automatic config can set some of parameters or all of them
2013-10-05 16:13:46 -07:00
46ca1eb91b
Moving Advanced button out of datadirField fieldset
2013-10-04 20:46:00 -04:00
f19a236c8e
Remove obsolete files.
2013-10-04 17:24:28 +02:00
12bb197028
JS version of the OCP\ITags interface
2013-10-04 17:21:52 +02:00
85f63d4f77
Allow "Finishing..." button on setup page to be translated.
...
Fixes #5130 .
2013-10-04 11:09:59 -04:00
8b08b1b455
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/private/util.php
2013-10-02 10:11:18 +02:00
3e4d56d7bb
adding warning about failed apache module auth
2013-10-02 01:02:46 +02: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
084f76fd14
grammar fixes
2013-09-30 13:33:49 +02:00
b9a1f63344
go back to old template but add expire date as optional content
2013-09-30 10:02:26 +02:00
1efbf7774f
Fixed review issues
2013-09-29 20:16:32 -04:00
883d1c0df3
use template for txt and html mails to send notification mails
2013-09-25 11:51:28 +02:00
dc382bc9cc
autoconfig.php could have only some of parameters; installation.php generates UI accordingly
2013-09-25 00:13:38 -04:00
c486fc7608
introduce OC_Util::rememberLoginAllowed()
2013-09-24 18:01:34 +02:00
b693b5085c
don't remember login if the encrypion app is enabled because the user
...
needs to log-in again in order to decrypt his private key with his password
2013-09-24 13:08:55 +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
67c5be9f19
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 16:44:11 +02:00
c6eda25d50
remove show password toggle from log in page, ref #4577 #4580
2013-08-28 13:58:49 +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
0890a915b3
adding file templates for ods, odt and odp
2013-08-18 21:11:11 +02:00
12f4494de0
Merge pull request #4339 from owncloud/mimetype-defaults
...
Add the option to provide templates for newly created files
2013-08-17 08:42:49 -07:00
18769e1348
change font on login/install page from black to white
2013-08-17 10:26:30 +02:00
0aa7dc9b89
tixing width and position of wider error messages
2013-08-16 00:56:09 +02:00
399adf67b0
merge master into css-fixes
2013-08-16 00:29:43 +02:00
7279a07ca2
Merge branch 'master' into mimetype-defaults
...
Conflicts:
apps/files/ajax/newfile.php
2013-08-16 00:13:10 +02:00
367b248bc0
show 'More apps' link to app administration directly in app navigation
2013-08-07 18:18:09 +02:00
1c1ede5703
add template for html files
2013-08-07 16:53:33 +02:00
0a5be39446
remove unused and never to be used pagination
2013-07-31 09:58:57 +02:00
97f2c393c1
Allow apps to have own 404 content, closes #3225
2013-07-29 16:54:19 +03:00
284fb86258
show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary js & html ids
2013-07-24 19:56:57 +02:00
9b1866f1ac
merge master
2013-07-24 16:31:01 +02:00
876309a215
Merge pull request #4175 from owncloud/remember-checked
...
check remember log in by default, ref #3918
2013-07-24 07:05:41 -07:00
003ae7b916
use OC_Defaults directly from the template
2013-07-24 12:04:18 +02:00
75fd6d4fde
initialize OC_Defaults in template constructorX
2013-07-24 11:51:21 +02:00
6a5e2ea7d5
check remember log in by default, ref #3918
2013-07-24 10:01:56 +02:00
38bfae57fe
sticky footer
2013-07-23 18:36:45 +02:00
14edfa52ea
input field adjustments for new full-color background on log in
2013-07-23 18:36:44 +02:00
107ace42b8
rip out unneeded #login div, replace with existing body-login
2013-07-23 18:36:44 +02:00
20791e0ad1
use themable strings for installation
2013-07-11 17:39:44 +02:00
aacca494c5
introduce shortname themable string and split from title, use for image alt text
2013-07-11 16:38:07 +02:00
83898e87be
Merge https://github.com/owncloud/core/pull/3900
...
Squashed commit of the following:
commit a34098427720c2d0470367cd9698c184d85b8dfd
Merge: ccf849b 955646c3c1308f
2013-07-05 10:07:23 +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
23cc69b816
construct the foother in defaults.php so that we use always the same footer
...
Conflicts:
settings/templates/admin.php
2013-07-01 10:46:00 +02:00
414b5f150e
Merge pull request #2914 from Kondou-ger/label_overlapping_value
...
Fix textfield label overlapping value.
2013-06-29 04:09:50 -07:00
aaefa157fd
hide the logo claim in case the theme is not loaded
2013-06-17 20:35:08 +02:00
f3d33a7d5b
remove » and « from the text mail because they will be escaped
2013-06-14 20:04:20 +02:00
ff64278a07
Do no translate "ownCloud - "
2013-06-14 18:02:35 +02:00
3cd7747e7b
Use templates to theme share e-mails ( #3683 )
2013-06-14 17:38:56 +02:00
15eda53215
improved footer
2013-06-13 16:10:33 +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
918906f042
make footer aware of ownCloud editions
2013-06-12 14:49:30 +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
27a5132b46
Don't set image path in template.
2013-05-20 09:44:31 +02:00
a0b79f5649
Dialogs: Loose up-button.
2013-05-17 06:48:24 +02:00
152e275c8a
Various cleanups in OC.dialogs
2013-05-17 04:54:08 +02:00
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
739f799912
Add requesttoken to guest view
...
Should fix #3321
2013-05-13 14:23:56 +02: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
c8cafcefe4
move password warning more relevant below password field, un-nest log in warning
2013-04-17 17:16:15 +02:00
f3c06ae4e4
Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better
...
Handle empty datafolder better.
2013-04-17 00:44:14 -07:00
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
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
c6dbb33e15
Fix textfield label overlapping value.
2013-04-13 14:48:16 +02:00
59be6a910c
Implements Toggle for Database Password.
2013-04-13 09:45:30 +05:30
000a568b4a
Long Application Names are ellipsis correctly.
2013-04-10 19:14:50 +05:30
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
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
630ee644db
Don't sanitize error message hint
2013-03-06 12:56:27 +01:00
07dee24cb2
explicitly add empty placeholder to inputs which use infield labels, fix #2049
2013-03-04 22:11:57 +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
39e28c0170
Typo...
2013-02-27 23:19:38 +01:00
6f14bec70a
Add a missing )
2013-02-27 23:15:18 +01:00
229c907a57
[core] From echo to p
2013-02-27 22:55:39 +01:00
40e51d13d2
Remove uneeded file
2013-02-27 22:35:37 +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
9898ba4daf
Merge branch 'master' into master-sqlserver
...
Conflicts:
core/templates/installation.php
2013-02-22 22:59:09 +01:00
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08: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
19c5213b53
Join split translated strings
2013-02-21 23:47:56 +01:00
1a747b3e48
Style cleanup core dir
2013-02-21 23:47:21 +01:00
e7d1bbfae3
fix giant advanced caret in installation
2013-02-21 18:20:14 +01:00
2675290325
Merge branch 'master' into master-sqlserver
2013-02-18 11:39:04 +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
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
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
bb52271d22
exchange bright caret with dark triangle
2013-02-14 18:22:45 +01: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
09d9138f84
fix caret on installation page for IE
2013-02-14 10:58:05 +01:00
d3ef967993
Fix indentation style
2013-02-14 08:36:26 +01:00
76b31f870c
Merge branch 'master' into master-sqlserver
2013-02-12 00:32:38 +01:00
41ec976fd7
Bugfixes and cleanup MS SQL Server installation
2013-02-10 13:07:59 +01:00
1ba44a3325
Merge pull request #1538 from raghunayyar/admin-password-toggle
...
Password Toggle Works on Installation
2013-02-10 02:38:43 -08:00
bebdd113f5
use proper HTML for other security warning too
2013-02-08 19:59:42 +01:00
a26e66b232
improve and shorten security warning, add link to docs, fix #1342
2013-02-08 13:38:50 +01:00
eea4864c70
Removed whitespace from installation.php
2013-02-08 17:35:41 +05:30
b356b7065f
Password Toggle Works on Installation as well.
2013-02-08 16:38:28 +05:30
d577f790c8
Added MS SQL Server support
2013-02-08 00:00:51 +01:00
217328e0e3
Merge pull request #1514 from owncloud/fix-setup
...
Fix setup
2013-02-07 13:48:44 -08:00
867650ee47
Merge pull request #1529 from owncloud/installation-login-fixes
...
Installation login fixes
2013-02-07 13:40:25 -08:00
8ca730f4c1
make show password toggle work for installation (once #1525 is fixed)
2013-02-07 18:07:38 +01:00
20b6cb28b1
Fix warning with displayname in user layout template
2013-02-07 18:07:27 +01:00
32e739f2ae
make show password not specific to log in
2013-02-07 17:41:24 +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
4c406c9ab1
fix shorttag issue mentioned in #1357
2013-02-06 18:19:26 +01:00
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
8ea6398e48
collapse user menu when inside one of the settings sections
2013-02-06 16:03:01 +01:00
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
964ff88f71
move inline style to CSS file, fix details
2013-02-06 15:15:20 +01:00
3bcf3c91e1
Password Toggle Support for Login
2013-02-03 11:56:00 +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
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
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
1d44a99ebb
Merge branch 'master' into updater-CSP
...
Conflicts:
core/templates/update.php
2013-01-28 09:57:24 +01:00
0986b6f910
Use global oc_requesttoken for Event Source
2013-01-26 16:36:48 -05: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
dbc13cf6ee
Move update inline JS
2013-01-25 19:18:16 +01: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
846971ec11
Fix merge conflict
2013-01-23 11:33:25 +01:00
fe56e4df7d
Fix merge conflict
2013-01-23 11:32:14 +01:00
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
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
39da6f8166
Move timezone check to external JS
2013-01-21 21:10:44 +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
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
eab6d7eb23
Enhanced auth is totally unmaintained and broken
...
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
216a5af396
Remove uneeded file
...
logout.php is a legacy file, which isn't used anymore in the ownCloud
code.
2013-01-11 16:49:55 +01:00
1eb3c8ecf6
Correct link to the bugtracker in exception.php
2013-01-11 16:42:06 +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
e475c26f1a
fixing <input> tag
2013-01-07 21:23:14 +01:00
2012603b74
Merge branch 'master' into fix-issue-1085
2013-01-07 14:16:32 -05:00
Frank Karlitschek
Joas Schilling
Morris Jobke
ringmaster
Bjoern Schiessle
Robin Appelman
Thomas Müller
Ramiro Aparicio
Jörn Friedrich Dreyer
raghunayyar
Victor Dubiniuk
Thomas Tanghus
Vincent Petry
Jake Wilson
Jan-Christoph Borchardt
Owen Winkler
vsapronov
kondou
Bart Visscher
Stephan Arts
Lukas Reschke
Paul Brown
Henning Oschwald
Brice Maron
Qingping Hou
Bernhard Posselt
Administrator
Tobias Ramforth
Michael Gapczynski
Georg Ehrke