131d82e41e
move call to print_unescaped() to template
2013-10-07 11:49:43 +02:00
5a174eba83
use correct property for mimetype of existing files
2013-10-07 11:14:11 +02:00
3613e79e10
[tx-robot] updated from transifex
2013-10-06 19:16:10 -04:00
94ae66c651
fix web interface showing very small when accessed on smartphone
2013-10-06 22:50:11 +03:00
676ded0c63
properly indent contents of folders for app styles, to line up with text
2013-10-06 22:40:29 +03:00
c8c83e0e02
improve clickability of footer link
2013-10-06 22:35:24 +03:00
1537410a31
Merge pull request #5154 from owncloud/fix-appimages
...
fix mobile and desktop app images looking different
2013-10-06 12:31:54 -07:00
bf83b1eb90
Optimize images with optipng
2013-10-06 21:20:49 +02: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
11a69fbddf
fix mobile and desktop app images looking different
2013-10-05 15:40:00 +03:00
485bb100b3
Merge pull request #5131 from owncloud/fix-5130
...
Allow "Finishing..." button on setup page to be translated.
2013-10-05 02:32:28 -07:00
2b521327c0
more elegant style for Personal and Admin settings
2013-10-05 11:23:49 +02:00
46ca1eb91b
Moving Advanced button out of datadirField fieldset
2013-10-04 20:46:00 -04:00
cc1e69c190
Merge pull request #5136 from owncloud/design-fixes
...
Design fixes
2013-10-04 14:56:09 -07:00
9c230f8c85
Merge branch 'js_vcategories_to_tags' of github.com:owncloud/core into js_vcategories_to_tags
2013-10-04 20:03:31 +02:00
0e0927a887
It's 'status', not 'result'!
2013-10-04 20:02:33 +02:00
6d3bbc5eeb
Fix typo
2013-10-04 19:55:03 +02:00
1cae6661df
add useful icon from News app to core
2013-10-04 20:27:01 +03:00
2166d99b53
prevent hover effect when settings are open
2013-10-04 20:24:07 +03:00
0b78db4750
fix disabled buttons not showing icons
2013-10-04 20:21:36 +03: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
0c53269b5e
remove specific border-radius for .primary button as it should be specific to log in instead
2013-10-04 17:37:20 +03:00
041837de2c
merge master into input-simplify
2013-10-04 17:08:34 +03:00
e257c3f27c
Fixed array syntax to work with PHP 5.3
...
It seems that array brackets are only supported starting with PHP 5.4.
Fixed the array brackets to be compatible and not cause a syntax error
in PHP 5.3.
2013-10-04 14:28:11 +02:00
51295e9a6b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
apps/files/templates/index.php
2013-10-04 12:30:49 +02:00
a223cf769a
Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core into sharing_mail_notification_master
...
Conflicts:
core/ajax/share.php
2013-10-04 12:27:18 +02:00
304803d102
fix array_diff call
2013-10-04 12:23:40 +02:00
514d7a884a
Merge pull request #5107 from owncloud/user_skeleton
...
make it possible to prepopulate a new user home with a skeleton
2013-10-04 02:57:17 -07:00
566d826a9e
add a real examplefile instead of an .gitignore which is a bit stupid here
2013-10-04 10:21:33 +02:00
ecd2bf2a55
Merge pull request #5109 from owncloud/controls-bar-height
...
Controls bar height
2013-10-04 01:01:54 -07:00
c335169f6d
increase height of controls bar and elements to more clickable 44px
2013-10-04 08:41:16 +03:00
b0ff10a536
Hide defaultavatar in #header and don't darken proper avatars in #header
2013-10-04 02:27:53 +02:00
e40afbebc6
make it possible to prepopulate a new user gome with a skeleton
2013-10-03 23:22:11 +02:00
3c13afee98
better style and color for warning and success feedback on inputs
2013-10-03 16:58:48 +03:00
308d4383a3
simplify input elements for less cognitive load. No box-shadow, no text-shadow, smaller border-radius
2013-10-03 16:35:42 +03:00
d09b1553d0
Fixed syntax error in array
2013-10-03 11:31:21 +02:00
9c23c3449b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
core/css/share.css
2013-10-02 23:33:50 +02:00
99fa4898fd
just fix whitespace stuff
2013-10-02 18:27:55 +02:00
5feaa55779
simplify From Link icon in New menu
2013-10-02 18:27:39 +03:00
c548edd90f
remove box-shadows for header, navigation and controls bar - looks sharper and less washed out
2013-10-02 17:59:38 +03:00
8ce26297b9
reduce rounded corners of Share and Versions dropdown
2013-10-02 17:53:54 +03: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
b58a464b86
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
...
don't remember login if the encrypion app is enabled
2013-09-30 10:53:41 -07:00
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
084f76fd14
grammar fixes
2013-09-30 13:33:49 +02:00
17aa49a890
fix mail subject; don't show time for expire date
2013-09-30 13:33:02 +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
710d3f139f
followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation
2013-09-29 01:46:23 -04:00
59e4ff7d24
[tx-robot] updated from transifex
2013-09-29 00:03:26 -04:00
4907685405
Base defaultavatar text on displayname
...
Fix #4876
2013-09-28 16:46:53 +02:00
f31d31844e
[tx-robot] updated from transifex
2013-09-27 00:02:30 -04:00
6b1d70f148
Merge pull request #4887 from owncloud/sharing_disable_public_upload
...
check only permission from link-share to decide if public upload is enabled or disabled
2013-09-26 03:16:15 -07:00
70dccd28ef
Merge pull request #4987 from owncloud/different_color_placeholder
...
Make it possible to have a different color than the username for placeholder
2013-09-25 10:11:52 -07:00
5e7a7b3f61
Shorten optional text-argument processing
2013-09-25 17:19:38 +02:00
24eb41548e
Make it possible to have a different color than the username for placeholder
2013-09-25 12:57:41 +02: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
2d12e52769
[tx-robot] updated from transifex
2013-09-24 12:59:48 -04:00
6d0987bdb4
some small js fixes
2013-09-24 18:32:57 +02: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
fc76a13c52
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/public/share.php
2013-09-23 11:18:00 +02:00
9851f0f4f2
Merge pull request #4896 from owncloud/sharing_allow_disable_password
...
sharing, allow user to disable password protection
2013-09-23 01:20:09 -07:00
28918d61d2
[tx-robot] updated from transifex
2013-09-22 12:58:42 -04:00
5b95e7aa0f
[tx-robot] updated from transifex
2013-09-20 10:50:14 -04:00
71e129f295
initialize variable
2013-09-20 15:47:33 +02:00
12b4e79201
calculate correct permissions while toggle the password protection
2013-09-20 13:11:05 +02:00
8e26f291a7
Merge pull request #4684 from owncloud/improved-console
...
Use more object oriented way for console commands
2013-09-19 14:22:32 -07:00
f9549a4465
Merge pull request #4908 from owncloud/fix_css_selector
...
css selectors never have a : before []
2013-09-19 10:59:45 -07:00
a9ea99e93d
Add copyright, remove starting blank line
2013-09-19 19:12:16 +02:00
7e0631b3b8
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/filelist.js
2013-09-19 17:00:54 +02:00
9f9eb1b08f
Merge pull request #4263 from owncloud/search_scrollto
...
initial scrollto implementation
2013-09-19 05:49:45 -07:00
078bf0df25
use {count} instead of 'One' for more versatile translation
2013-09-19 12:05:30 +02:00
a6933efce3
use n to translate title
2013-09-19 11:25:41 +02:00
cda58ae3df
css selectors never have a : before []
2013-09-19 10:14:07 +02:00
0d81a53e12
use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there
2013-09-19 10:00:42 +02:00
f7800cd63e
fix 'event is not defined' error
2013-09-19 09:47:51 +02:00
72d53008cc
indentation
2013-09-18 17:58:15 +02:00
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
7bd5e89f8c
simplify conflict template handling, fix reopen after ESC
2013-09-18 17:22:29 +02:00
64cc13a8d3
allow passing classes to buttons
2013-09-18 17:13:07 +02:00
342a420eba
disable avatar loading on public guest page
2013-09-17 19:25:03 +02:00
e43e961dcb
we cannot load avatar on guest page
2013-09-17 19:20:16 +02:00
3f7f6434d1
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-17 19:11:47 +02:00
b59ce403d8
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/css/files.css
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files_sharing/js/public.js
core/js/jquery.ocdialog.js
core/js/oc-dialogs.js
2013-09-17 19:10:46 +02:00
b40925ae17
initial scrollto implementation:
...
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
2013-09-17 18:40:51 +02:00
642b064c5b
we can leave the loop if the permission of the link share was checked
2013-09-17 18:18:23 +02:00
d6771502f2
check only permission from link-share to decide if public upload is enabled or disabled
2013-09-17 18:11:43 +02:00
2e79aab0ce
Merge pull request #4871 from owncloud/add_exists_method_to_jquery
...
add exists method to jquery
2013-09-17 06:07:50 -07:00
5cf12888ad
[tx-robot] updated from transifex
2013-09-16 11:38:45 -04:00
afe4f6a794
add exists method to jquery
2013-09-16 13:47:37 +02:00
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
Thomas Müller
Jörn Friedrich Dreyer
Jan-Christoph Borchardt
Morris Jobke
kondou
Owen Winkler
VicDeo
vsapronov
Thomas Tanghus
ringmaster
Vincent Petry
Bjoern Schiessle
Frank Karlitschek
Alessandro Cosentino
Björn Schießle
Bart Visscher
Bernhard Posselt