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
d39655e126
Move template parameters around so database error page is properly rendered
2013-01-07 14:15:51 -05:00
7ca740fa3d
Merge pull request #632 from owncloud/fix_629
...
fix pattern for database names - #629
2013-01-06 14:03:02 -08:00
5ea8adc7c7
Reformat long line
2013-01-05 12:21:57 -05:00
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
7505837079
Basic update progress of database update only
2013-01-03 21:32:33 -05:00
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
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +01:00
bbe805b665
use regex which was suggested by dragotin
2012-12-17 12:28:34 +01:00
df7d6cb26c
More style fixes
2012-12-15 00:43:46 +01:00
9d8bdff51b
tweak icons for username and password fields, now it’s good
2012-12-12 22:40:08 +01:00
90e8e94909
icons for username and password field, not sure if it’s good
2012-12-11 18:54:43 +01:00
75367f91e0
Merge pull request #721 from owncloud/improve-installation-and-login
...
Improve installation and login
2012-12-07 05:30:30 -08:00
1e062ea895
Merge pull request #182 from owncloud/fix-redirect
...
Make the redirect_url working again
2012-12-07 03:09:19 -08:00
4f513f279a
fix dbhostlabel not disappearing, remove obsolete CSS
2012-12-06 16:41:06 +01:00
0fa59f8937
use vector logo also on log in page, d'oh (also now retina-ready)
2012-12-06 16:29:56 +01:00
b6fca70ee4
add primary action button in fitting subtle dark blue
2012-12-05 00:37:00 +01:00
56dae06528
move inline warning styles into CSS, clean up and fix #270
2012-12-05 00:25:58 +01:00
13e0287b74
better layout for installation page elements, centered and subdued legend text
2012-12-04 23:55:31 +01:00
5ccea4cc2f
small fixes: toggle color adjustment, remove colon, prevent label wrapping
2012-12-04 23:09:30 +01:00
855a011697
group related input fields visually
2012-12-04 16:58:42 +01:00
a0fe53d09a
fix pattern for database names
2012-11-29 15:08:05 +01:00
19797ee7db
even error messages have the right to look a bit pretty
2012-11-23 14:22:57 +01:00
03b8ba273a
Fix lostpassword url generation
...
Fixes issue #262
2012-11-16 22:01:24 +01:00
b51b9539d0
Very simple js console switcher.
2012-11-15 19:43:10 +01:00
be77d81152
VCategories: Closing brace must be on a line by itself.
2012-11-05 16:38:23 +01:00
8c492a86fc
VCategories: Line too long.
2012-11-05 16:35:25 +01:00
8ac3849a95
Merge pull request #238 from fmms/checkstyle04
...
Checkstyle fixes
2012-11-04 08:59:45 -08:00
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
81f019b6c5
Make the redirect_url working again
...
Fixes #160
2012-10-31 22:03:55 +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
Bart Visscher
Jan-Christoph Borchardt
Thomas Mueller
Robin Appelman
Lukas Reschke
Administrator
raghunayyar
Tobias Ramforth
Björn Schießle
Michael Gapczynski
Georg Ehrke
Bernhard Posselt
Frank Karlitschek
Thomas Tanghus
Felix Moeller