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
Bart Visscher
Jan-Christoph Borchardt
Thomas Müller
raghunayyar
Lukas Reschke
Björn Schießle
Michael Gapczynski
Georg Ehrke
Bernhard Posselt