Jan-Christoph Borchardt
14edfa52ea
input field adjustments for new full-color background on log in
2013-07-23 18:36:44 +02:00
Jan-Christoph Borchardt
107ace42b8
rip out unneeded #login div, replace with existing body-login
2013-07-23 18:36:44 +02:00
Jan-Christoph Borchardt
20791e0ad1
use themable strings for installation
2013-07-11 17:39:44 +02:00
Jan-Christoph Borchardt
aacca494c5
introduce shortname themable string and split from title, use for image alt text
2013-07-11 16:38:07 +02:00
Björn Schießle
83898e87be
Merge https://github.com/owncloud/core/pull/3900
...
Squashed commit of the following:
commit a34098427720c2d0470367cd9698c184d85b8dfd
Merge: ccf849b 955646c
Author: Björn Schießle <schiessle@owncloud.com>
Date: Fri Jul 5 09:59:29 2013 +0200
Merge branch 'master' into theme_aware_mail_footer
commit ccf849bc6f18d80cdb593e851529b87579fe072b
Merge: 8d5fb70 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:03:47 2013 +0200
Merge branch 'master' into theme_aware_mail_footer
commit 8d5fb70e6dcb2e2e34dcdf2a883680ef034afeea
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 10:38:39 2013 +0200
switch to non-static defaults.php
commit 88ab2768dcc4ced12c48872c887baa94ad938d62
Merge: e199df8 84c25f9
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 3 16:59:48 2013 +0200
Merge branch 'theme_aware_mail_footer' of github.com:owncloud/core into theme_aware_mail_footer
Conflicts:
core/templates/altmail.php
commit e199df844b5faf80a36d8380a5b0b58025cd425f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 3 16:56:29 2013 +0200
name and slogan should be in one line
commit 84c25f9853e1bfbe4ae780371b1353aafb6b15c2
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon Jul 1 21:15:35 2013 +0200
no ?> at the end of a file
commit 3bd8d38d011f62ce78bcd0c108eb8cf2ce97eb99
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 12:58:36 2013 +0200
print url unescaped
commit d304ed18c8b7350e92e24565b9b9ba77b519d74c
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 12:56:05 2013 +0200
make new mail templates aware of different ownCloud themes
2013-07-05 10:07:23 +02:00
Björn Schießle
3c691c9ec9
move to non-static OC_Defaults
...
Conflicts:
lib/mail.php
2013-07-04 10:11:16 +02:00
Björn Schießle
d46e62886a
Add init funtion to OC_Defaults to be able to wrap translatable strings
2013-07-04 10:09:28 +02:00
Björn Schießle
d97d00fe0f
add logo claim to defaults.php
2013-07-01 10:48:13 +02:00
Björn Schießle
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
Bart Visscher
414b5f150e
Merge pull request #2914 from Kondou-ger/label_overlapping_value
...
Fix textfield label overlapping value.
2013-06-29 04:09:50 -07:00
Jan-Christoph Borchardt
aaefa157fd
hide the logo claim in case the theme is not loaded
2013-06-17 20:35:08 +02:00
Thomas Mueller
f3d33a7d5b
remove » and « from the text mail because they will be escaped
2013-06-14 20:04:20 +02:00
Stephan Arts
ff64278a07
Do no translate "ownCloud - "
2013-06-14 18:02:35 +02:00
Stephan Arts
3cd7747e7b
Use templates to theme share e-mails ( #3683 )
2013-06-14 17:38:56 +02:00
Björn Schießle
15eda53215
improved footer
2013-06-13 16:10:33 +02:00
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
Jan-Christoph Borchardt
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
Thomas Mueller
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
Lukas Reschke
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
Lukas Reschke
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
Lukas Reschke
1eb3c8ecf6
Correct link to the bugtracker in exception.php
2013-01-11 16:42:06 +01:00
Thomas Mueller
c2b3c7ed3e
fixing text-align on navigation menu - closing div was missing - THX Lukas
2013-01-11 15:19:53 +01:00
Thomas Mueller
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
Thomas Mueller
e475c26f1a
fixing <input> tag
2013-01-07 21:23:14 +01:00
Michael Gapczynski
2012603b74
Merge branch 'master' into fix-issue-1085
2013-01-07 14:16:32 -05:00
Michael Gapczynski
d39655e126
Move template parameters around so database error page is properly rendered
2013-01-07 14:15:51 -05:00
Thomas Müller
7ca740fa3d
Merge pull request #632 from owncloud/fix_629
...
fix pattern for database names - #629
2013-01-06 14:03:02 -08:00
Michael Gapczynski
5ea8adc7c7
Reformat long line
2013-01-05 12:21:57 -05:00
Michael Gapczynski
a94405b4e4
Only show the version updating to instead of worrying about converting internal to a formatted version
2013-01-04 20:13:00 -05:00
Michael Gapczynski
7505837079
Basic update progress of database update only
2013-01-03 21:32:33 -05:00
Thomas Müller
7d811e57e6
setting the timezone is now part of the login process and true part of the core.
2012-12-20 11:10:45 +01:00
Jan-Christoph Borchardt
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +01:00
Georg Ehrke
bbe805b665
use regex which was suggested by dragotin
2012-12-17 12:28:34 +01:00
Bart Visscher
df7d6cb26c
More style fixes
2012-12-15 00:43:46 +01:00
Jan-Christoph Borchardt
9d8bdff51b
tweak icons for username and password fields, now it’s good
2012-12-12 22:40:08 +01:00
Jan-Christoph Borchardt
90e8e94909
icons for username and password field, not sure if it’s good
2012-12-11 18:54:43 +01:00
Bart Visscher
75367f91e0
Merge pull request #721 from owncloud/improve-installation-and-login
...
Improve installation and login
2012-12-07 05:30:30 -08:00
Bart Visscher
1e062ea895
Merge pull request #182 from owncloud/fix-redirect
...
Make the redirect_url working again
2012-12-07 03:09:19 -08:00
Jan-Christoph Borchardt
4f513f279a
fix dbhostlabel not disappearing, remove obsolete CSS
2012-12-06 16:41:06 +01:00
Jan-Christoph Borchardt
0fa59f8937
use vector logo also on log in page, d'oh (also now retina-ready)
2012-12-06 16:29:56 +01:00
Jan-Christoph Borchardt
b6fca70ee4
add primary action button in fitting subtle dark blue
2012-12-05 00:37:00 +01:00
Jan-Christoph Borchardt
56dae06528
move inline warning styles into CSS, clean up and fix #270
2012-12-05 00:25:58 +01:00
Jan-Christoph Borchardt
13e0287b74
better layout for installation page elements, centered and subdued legend text
2012-12-04 23:55:31 +01:00
Jan-Christoph Borchardt
5ccea4cc2f
small fixes: toggle color adjustment, remove colon, prevent label wrapping
2012-12-04 23:09:30 +01:00
Jan-Christoph Borchardt
855a011697
group related input fields visually
2012-12-04 16:58:42 +01:00
Georg Ehrke
a0fe53d09a
fix pattern for database names
2012-11-29 15:08:05 +01:00
Frank Karlitschek
19797ee7db
even error messages have the right to look a bit pretty
2012-11-23 14:22:57 +01:00
Bart Visscher
03b8ba273a
Fix lostpassword url generation
...
Fixes issue #262
2012-11-16 22:01:24 +01:00
Thomas Tanghus
b51b9539d0
Very simple js console switcher.
2012-11-15 19:43:10 +01:00
Thomas Tanghus
be77d81152
VCategories: Closing brace must be on a line by itself.
2012-11-05 16:38:23 +01:00
Thomas Tanghus
8c492a86fc
VCategories: Line too long.
2012-11-05 16:35:25 +01:00
Thomas Müller
8ac3849a95
Merge pull request #238 from fmms/checkstyle04
...
Checkstyle fixes
2012-11-04 08:59:45 -08:00
Felix Moeller
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
Lukas Reschke
81f019b6c5
Make the redirect_url working again
...
Fixes #160
2012-10-31 22:03:55 +01:00
Lukas Reschke
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
Jan-Christoph Borchardt
d7abd44dea
merge breadcrumb root into navigation
2012-10-28 17:10:31 +01:00
Georg Ehrke
d7a6b09406
deny the usage of dots in database name
2012-10-28 14:11:41 +01:00
Jan-Christoph Borchardt
cf2a504d42
Merge branch 'master' into navigation
2012-10-28 14:10:10 +01:00
Lukas Reschke
5245e2b6be
->l expects two parameters
2012-10-28 10:33:18 +01:00
Lukas Reschke
2d5edead77
Revert "Fix a typo"
...
This reverts commit a306e4b8a0
.
2012-10-28 10:21:06 +01:00
Lukas Reschke
a306e4b8a0
Fix a typo
2012-10-28 10:19:31 +01:00
Jan-Christoph Borchardt
fc280b2887
first move of settings to top right
2012-10-27 18:58:16 +02:00
Jan-Christoph Borchardt
b595ea6efc
first icon update. Next step: make sprited hover state (like for home already)
2012-10-27 17:44:24 +02:00
Jan-Christoph Borchardt
3eea7aac13
first base on navigation rework, less obtrusive, icons need to be updated, settings moved
2012-10-26 23:38:36 +02:00
Lukas Reschke
ec613b589b
Fix not defined JS variables
2012-10-25 17:51:59 +02:00
scambra
41b597e179
Translate formatDate using jquery datepicker
2012-10-19 13:56:19 +02:00
scambra
a24d8db4b2
translate datepicker
2012-10-19 13:56:19 +02:00
Lukas Reschke
3eb43c1fbe
Show a warning in the installer if .htaccess is not working
2012-10-15 23:25:15 +02:00
Michael Göhler
d7a4547482
avoid undefined index warning on login page
2012-10-15 20:37:52 +02:00
Lukas Reschke
842d6dad47
Remove space
2012-10-15 17:42:38 +02:00
Lukas Reschke
d33bec09fe
Verify password page for users
2012-10-15 17:42:38 +02:00
Lukas Reschke
c930ac9f88
Merge pull request #30 from visit1985/logonpage
...
extend logon page to display multiple error messages
2012-10-15 03:52:11 -07:00
Michael Göhler
7095b3a083
extend logon page to display multiple error messages
2012-10-14 19:57:24 +02:00
Lukas Reschke
2c427f050e
Show a warning in the installer if no secure RNG is available
2012-10-14 17:18:30 +02:00
Björn Schießle
f493e97f5d
always generate access token, also for forms shown to anonymous users (e.g. public shares)
2012-10-05 10:32:38 +02:00
Robin Appelman
f8eebcbb01
reload the current url when login in instead of always redirecting to the default app (oc-1873)
2012-09-30 03:47:37 +02:00
Lukas Reschke
578aa4e425
Removed sectoken
...
This token is completly useless since an attacker can easily extract it
from the page.
2012-09-29 15:18:38 +02:00
Christian Reiner
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
Christian Reiner
743826bbf3
Reimplementation of CSRF protection including autorefresh
2012-09-28 13:30:44 +02:00
Frank Karlitschek
df528cfe95
show the current username. This confused some people
2012-09-12 12:23:21 +02:00
Bart Visscher
edcd297476
Move handling of core remotes to OC_TemplateLayout
2012-09-07 16:42:46 +02:00
Thomas Mueller
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
Bart Visscher
6324daecc0
Don't wait for document ready for setting requesttoken
2012-08-30 23:10:24 +02:00
Michael Gapczynski
e5cbc532c3
Fix password authentication for links and fix template problems for links by creating a new base layout
2012-08-29 11:54:49 -04:00
Jörn Friedrich Dreyer
c8255a170c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
...
Conflicts:
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/smb4php/smb.php
apps/bookmarks/ajax/addBookmark.php
apps/bookmarks/ajax/editBookmark.php
apps/bookmarks/appinfo/migrate.php
apps/calendar/ajax/calendar/edit.form.php
apps/calendar/ajax/changeview.php
apps/calendar/ajax/import/import.php
apps/calendar/ajax/settings/guesstimezone.php
apps/calendar/ajax/settings/setfirstday.php
apps/calendar/ajax/settings/settimeformat.php
apps/calendar/ajax/share/changepermission.php
apps/calendar/ajax/share/share.php
apps/calendar/ajax/share/unshare.php
apps/calendar/appinfo/app.php
apps/calendar/appinfo/remote.php
apps/calendar/appinfo/update.php
apps/calendar/appinfo/version
apps/calendar/js/calendar.js
apps/calendar/l10n/da.php
apps/calendar/l10n/de.php
apps/calendar/l10n/fi_FI.php
apps/calendar/l10n/gl.php
apps/calendar/l10n/he.php
apps/calendar/l10n/hr.php
apps/calendar/l10n/ja_JP.php
apps/calendar/l10n/lb.php
apps/calendar/l10n/lt_LT.php
apps/calendar/l10n/nb_NO.php
apps/calendar/l10n/pl.php
apps/calendar/l10n/pt_PT.php
apps/calendar/l10n/ro.php
apps/calendar/l10n/ru.php
apps/calendar/l10n/sv.php
apps/calendar/l10n/zh_CN.php
apps/calendar/l10n/zh_TW.php
apps/calendar/lib/app.php
apps/calendar/lib/calendar.php
apps/calendar/lib/object.php
apps/calendar/lib/share.php
apps/calendar/templates/part.choosecalendar.rowfields.php
apps/calendar/templates/part.import.php
apps/calendar/templates/settings.php
apps/contacts/ajax/activation.php
apps/contacts/ajax/addressbook/delete.php
apps/contacts/ajax/contact/add.php
apps/contacts/ajax/contact/addproperty.php
apps/contacts/ajax/contact/delete.php
apps/contacts/ajax/contact/deleteproperty.php
apps/contacts/ajax/contact/saveproperty.php
apps/contacts/ajax/createaddressbook.php
apps/contacts/ajax/cropphoto.php
apps/contacts/ajax/currentphoto.php
apps/contacts/ajax/importaddressbook.php
apps/contacts/ajax/oc_photo.php
apps/contacts/ajax/savecrop.php
apps/contacts/ajax/selectaddressbook.php
apps/contacts/ajax/updateaddressbook.php
apps/contacts/ajax/uploadimport.php
apps/contacts/ajax/uploadphoto.php
apps/contacts/appinfo/migrate.php
apps/contacts/appinfo/remote.php
apps/contacts/css/contacts.css
apps/contacts/import.php
apps/contacts/index.php
apps/contacts/js/contacts.js
apps/contacts/l10n/ca.php
apps/contacts/l10n/cs_CZ.php
apps/contacts/l10n/da.php
apps/contacts/l10n/de.php
apps/contacts/l10n/el.php
apps/contacts/l10n/eo.php
apps/contacts/l10n/es.php
apps/contacts/l10n/et_EE.php
apps/contacts/l10n/eu.php
apps/contacts/l10n/fa.php
apps/contacts/l10n/fi_FI.php
apps/contacts/l10n/fr.php
apps/contacts/l10n/he.php
apps/contacts/l10n/hr.php
apps/contacts/l10n/hu_HU.php
apps/contacts/l10n/ia.php
apps/contacts/l10n/it.php
apps/contacts/l10n/ja_JP.php
apps/contacts/l10n/ko.php
apps/contacts/l10n/lb.php
apps/contacts/l10n/mk.php
apps/contacts/l10n/nb_NO.php
apps/contacts/l10n/nl.php
apps/contacts/l10n/pl.php
apps/contacts/l10n/pt_BR.php
apps/contacts/l10n/pt_PT.php
apps/contacts/l10n/ro.php
apps/contacts/l10n/ru.php
apps/contacts/l10n/sk_SK.php
apps/contacts/l10n/sl.php
apps/contacts/l10n/sv.php
apps/contacts/l10n/th_TH.php
apps/contacts/l10n/tr.php
apps/contacts/l10n/zh_CN.php
apps/contacts/l10n/zh_TW.php
apps/contacts/lib/addressbook.php
apps/contacts/lib/hooks.php
apps/contacts/lib/vcard.php
apps/contacts/photo.php
apps/contacts/templates/part.contact.php
apps/contacts/templates/part.contacts.php
apps/contacts/templates/part.cropphoto.php
apps/contacts/templates/part.importaddressbook.php
apps/contacts/templates/part.selectaddressbook.php
apps/contacts/thumbnail.php
apps/files/ajax/download.php
apps/files/ajax/newfile.php
apps/files/ajax/timezone.php
apps/files/appinfo/update.php
apps/files/appinfo/version
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files_archive/js/archive.js
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/tests/proxy.php
apps/files_external/appinfo/app.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/tests/config.php
apps/files_external/tests/smb.php
apps/files_sharing/ajax/email.php
apps/files_sharing/ajax/getitem.php
apps/files_sharing/ajax/setpermissions.php
apps/files_sharing/ajax/share.php
apps/files_sharing/ajax/toggleresharing.php
apps/files_sharing/ajax/unshare.php
apps/files_sharing/ajax/userautocomplete.php
apps/files_sharing/js/settings.js
apps/files_sharing/js/share.js
apps/files_sharing/lib_share.php
apps/files_sharing/settings.php
apps/files_sharing/sharedstorage.php
apps/files_sharing/templates/settings.php
apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/versions.php
apps/gallery/ajax/thumbnail.php
apps/gallery/appinfo/app.php
apps/gallery/appinfo/update.php
apps/gallery/appinfo/version
apps/gallery/css/styles.css
apps/gallery/index.php
apps/gallery/js/pictures.js
apps/gallery/l10n/ca.php
apps/gallery/l10n/cs_CZ.php
apps/gallery/l10n/de.php
apps/gallery/l10n/el.php
apps/gallery/l10n/es.php
apps/gallery/l10n/fi_FI.php
apps/gallery/l10n/fr.php
apps/gallery/l10n/it.php
apps/gallery/l10n/pl.php
apps/gallery/l10n/pt_PT.php
apps/gallery/l10n/ru.php
apps/gallery/l10n/sl.php
apps/gallery/l10n/sv.php
apps/gallery/l10n/th_TH.php
apps/gallery/l10n/tr.php
apps/gallery/l10n/zh_CN.php
apps/gallery/lib/album.php
apps/gallery/lib/hooks_handlers.php
apps/gallery/lib/managers.php
apps/gallery/lib/photo.php
apps/gallery/lib/tiles.php
apps/gallery/lib/tiles_test.php
apps/gallery/templates/index.php
apps/media/lib_ampache.php
apps/media/lib_collection.php
apps/media/lib_media.php
apps/remoteStorage/lib_remoteStorage.php
apps/tasks/ajax/addtaskform.php
apps/tasks/ajax/edittask.php
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/lib_ldap.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/user_ldap.php
apps/user_migrate/appinfo/app.php
apps/user_migrate/templates/settings.php
apps/user_webfinger/host-meta.php
config/config.sample.php
core/js/js.js
core/l10n/da.php
core/l10n/de.php
core/l10n/fi_FI.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hr.php
core/l10n/id.php
core/l10n/ja_JP.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/nb_NO.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/sv.php
core/lostpassword/index.php
core/templates/layout.user.php
core/templates/login.php
db_structure.xml
index.php
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/af/settings.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/gallery.po
l10n/de/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/settings.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/settings.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/hy/settings.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/settings.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/settings.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/settings.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/settings.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/gallery.po
l10n/ru/settings.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/settings.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/gallery.po
l10n/sl/settings.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/templates/bookmarks.pot
l10n/templates/calendar.pot
l10n/templates/contacts.pot
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/gallery.pot
l10n/templates/media.pot
l10n/templates/settings.pot
l10n/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/gallery.po
l10n/zh_CN/settings.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/settings.po
lib/app.php
lib/base.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/filecache.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage/local.php
lib/filesystemview.php
lib/group/database.php
lib/helper.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/migrate.php
lib/mimetypes.fixlist.php
lib/ocs.php
lib/preferences.php
lib/public/json.php
lib/public/util.php
lib/template.php
lib/user.php
lib/user/database.php
lib/util.php
lib/vcategories.php
ocs/providers.php
settings/admin.php
settings/ajax/lostpassword.php
settings/ajax/removeuser.php
settings/ajax/setbackgroundjobsmode.php
settings/ajax/setlanguage.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/apps.php
settings/css/settings.css
settings/js/apps.js
settings/js/users.js
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lt_LT.php
settings/l10n/mk.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ru.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
settings/templates/admin.php
settings/templates/users.php
2012-08-25 00:05:07 +02:00
Bart Visscher
667cd318fe
Use OC_Util::displayLoginPage and cleanup the function
2012-08-10 11:43:04 +02:00
Thomas Tanghus
cc445e4e47
Small changes to allow updating main menu dynamically.
2012-08-05 01:42:17 +02:00
Jörn Friedrich Dreyer
795e78809f
add oracle to install & setup
2012-07-31 19:34:30 +02:00
Robin Appelman
b1010160b3
CSRF protection for eventsource
2012-07-22 16:37:49 +02:00
Georg Ehrke
f9d3388854
Merge branch 'master' into calendar_import
2012-07-21 17:37:10 +02:00
Bjoern Schiessle
20a174e71b
remove second "autocomplete" statement
2012-07-18 12:27:15 +02:00
Bjoern Schiessle
3895e3a5ae
remember username and provide autocomplete feature
2012-07-18 12:26:10 +02:00
Bjoern Schiessle
0ea29398c7
remember username and provide autocomplete feature
2012-07-18 12:22:30 +02:00
Georg Ehrke
4e53db3d9c
Merge branch 'master' into oc_error
2012-06-26 14:17:32 +02:00
Georg Ehrke
a113ee9e9f
add x-webkit-speech to searchbox
2012-06-24 00:42:16 +02:00
Georg Ehrke
243f910ae4
Merge branch 'master' into oc_error
2012-06-22 21:37:03 +02:00
Brice Maron
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
Bjoern Schiessle
34739b7ec5
use new sanitizeHTML() function
2012-06-21 13:57:18 +02:00
Georg Ehrke
ccacb6f918
Merge branch 'master' into oc_error
2012-06-19 11:30:18 +02:00
Florian Hülsmann
c3cd3f3571
CSS class headerAction -> header-action
2012-06-18 23:22:52 +02:00
Georg Ehrke
e31c9a7b6f
Merge branch 'master' into oc_error
2012-06-18 14:34:49 +02:00
Florian Hülsmann
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
Georg Ehrke
2c8a61ae9c
Merge branch 'master' into oc_error
2012-06-15 20:48:37 +02:00
Brice Maron
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
Thomas Tanghus
f0b87bc421
Make requesttoken global.
2012-06-14 18:13:01 +02:00
Thomas Tanghus
5b1a14f9ea
Contacts: Implement CSRF prevention.
2012-06-14 18:00:13 +02:00
Thomas Tanghus
625cd822c3
Backport CSRF prevention.
2012-06-14 13:52:22 +02:00
Michael Gapczynski
b5889d6ffe
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
...
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
2012-06-13 15:17:46 -04:00
Thomas Tanghus
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
Lukas Reschke
6defbc7f4d
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
Lukas Reschke
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
Georg Ehrke
f43fd1765e
fix merge conflicts
2012-06-08 11:23:58 +02:00
Bart Visscher
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
Brice Maron
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
Brice Maron
cc494259d3
Unit path and webpath, correct some more
2012-06-06 20:24:15 +00:00
Georg Ehrke
fa0c45b005
Merge branch 'master' into oc_error
2012-06-06 10:12:54 +02:00
Bart Visscher
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
Georg Ehrke
79bf933319
Merge branch 'master' into oc_error
2012-05-25 10:30:44 +02:00
Michiel de Jong
fc536c3491
add htmlentities() call into login form
2012-05-18 16:12:49 +02:00
Georg Ehrke
3d713e711b
Merge branch 'master' into oc_error
2012-05-17 22:17:31 +02:00
Michael Gapczynski
cbfbbe672c
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
...
Conflicts:
apps/files/templates/index.php
2012-05-17 15:38:28 -04:00
Bart Visscher
ce1e4425c2
Combine and minimize core and default app js files
2012-05-16 18:53:46 +02:00
Bart Visscher
f71fec8cdc
Combine and minimize core and default app css files
2012-05-16 18:53:46 +02:00
Michael Gapczynski
198b73ddd1
Sanitize search queries, thanks to Lukas Reschke
2012-05-13 15:57:46 -04:00
Georg Ehrke
a5f0ac811f
Merge branch 'master' into oc_error
2012-05-13 19:13:31 +02:00
Bart Visscher
20499e336b
Remove duplicate line
2012-05-11 22:13:05 +02:00
Vitaly Kuznetsov
6f981738bb
Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example)
2012-05-10 09:10:53 +00:00
Thomas Tanghus
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
Georg Ehrke
c536e930f4
add appswebroot to the guest template
2012-05-02 16:41:23 +02:00
Frank Karlitschek
051cb7d96b
show the username in the title. good idea.
2012-04-30 13:08:32 +02:00
Georg Ehrke
993d655aad
Merge branch 'master' into movable_apps_2
2012-04-27 10:30:50 +02:00
Frank Karlitschek
74b5e22a68
some more csrf fixes
2012-04-26 23:17:46 +02:00
Georg Ehrke
ebcaa46482
fix loading of css files that are core related
2012-04-26 15:19:27 +02:00
Georg Ehrke
a85d49833b
fix position of Semicolon
2012-04-24 21:52:44 +02:00
Georg Ehrke
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +02:00
Georg Ehrke
6b9072de58
fix merge conflicts
2012-04-22 13:20:25 +02:00
Robin Appelman
cfd0140e2f
fix 2 potential xss problems
2012-04-16 12:59:38 +02:00
Jan-Christoph Borchardt
70d0103a67
updated logos and icons
2012-04-16 11:34:16 +02:00
Georg Ehrke
c8cb870a27
Merge branch 'master' into oc_error
2012-04-15 22:27:47 +02:00
Jan-Christoph Borchardt
5868199e85
fixed settings hover, now whole row sensitive and fading not jerky
2012-04-15 13:34:30 +02:00
Georg Ehrke
e5e7d4a73a
fix merge conflicts
2012-04-13 16:44:31 -04:00
Frank Karlitschek
56bc2c4591
add a title attribute to the logout button
2012-04-12 20:34:56 +02:00
Robin Appelman
d01b78a4b4
prevent an possible xss exploit
2012-04-01 00:55:49 +02:00
Georg Ehrke
e45e48ff3d
Merge branch 'master' into oc_error
2012-03-29 23:18:47 +02:00
Georg Ehrke
d049d9bd0c
initial commit for OC_Exception
2012-03-29 23:16:19 +02:00
Arthur Schiwon
e2fd0bbf02
IE 8: fix appeareance of checkboxes on login and files pages
2012-03-29 18:32:25 +02:00
Georg Ehrke
ec40f69c9e
add error 403 site
2012-03-25 14:16:39 +02:00
Thomas Tanghus
03eb5197b6
Added category editor for apps using OC_VObjects.
2012-03-12 14:13:03 +01:00
Marvin Thomas Rabe
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
Bart Visscher
a25bda8e41
Add application name to title
2012-02-12 21:56:01 +01:00
Robin Appelman
039bbfde2d
automatically show advanced options when no sqlite is available
2012-01-29 18:00:55 +01:00