54ae799cd9
[tx-robot] updated from transifex
2013-10-30 03:33:25 -04:00
70111ea299
Add some color to the occ upgrade output.
2013-10-28 22:26:44 +01:00
b8dbec0da4
Use "else if" to remove one level of indentation.
2013-10-28 22:22:59 +01:00
f130caa4a2
Missed one write()->writeln(). Fixed.
2013-10-28 17:06:36 -04:00
bca1e12597
Use writeln() instead of write()
2013-10-28 16:53:36 -04:00
d1c5e5d777
Use the OutputInterface for output and return error codes.
2013-10-28 16:50:28 -04:00
8ab5da0833
Merge pull request #5592 from owncloud/lost_password_screen
...
Fixing lost password-screen
2013-10-29 09:50:32 -07:00
7223b5acce
Merge pull request #5396 from owncloud/fix-sharing-code
...
Fix sharing error message - id -> file name
2013-10-29 07:33:23 -07:00
b56c936212
also add new parameter to function calls
2013-10-29 14:22:24 +01:00
ffbcfef614
fix lost password screen - reuse available CSS rules
2013-10-29 13:42:39 +01:00
b0b76fe064
[tx-robot] updated from transifex
2013-10-29 07:31:51 -04:00
776346b503
Fixing the lost Password Screen
2013-10-29 01:33:12 +01:00
e9caaa933c
Fixing the Lost Password Screen
2013-10-29 01:29:38 +01:00
a24cbb50af
Move all upgrade routines into the command-line tool.
2013-10-28 10:15:56 -04:00
e62ca4ea4f
Append file etag to preview URLs
...
Fixes #5534
2013-10-28 14:14:55 +01:00
8df8211225
[tx-robot] updated from transifex
2013-10-27 07:27:22 -04:00
119ecc6f34
[tx-robot] updated from transifex
2013-10-27 02:32:11 -04:00
3248b0e2be
Fix broken users page when a username consists of digits only, fixes #5560
2013-10-25 22:00:32 +02:00
29a21466f3
Add `occ upgrade` command.
2013-10-24 13:59:39 -04:00
3917d18980
Merge pull request #5528 from frisco82/changeUpadateNotification
...
Changed update message to be more instructive
2013-10-24 10:28:17 -07: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
2102ab8fec
Fix leftcontent/right content, fixes tasks app
...
Tasks app layout was broken since the controls bar is higher now.
This change should hopefully fix other apps using the same layout.
2013-10-24 12:28:28 +02:00
535bc7b664
Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename
...
prevent user from creating or renaming sth. to an existing filename
2013-10-23 13:45:27 -07:00
291cdbdd98
Merge pull request #5497 from owncloud/ie8-placeholdershim
...
Ie8 placeholdershim
2013-10-23 13:18:37 -07:00
e95ad29d90
Merge pull request #5435 from owncloud/share-improvements
...
Share improvements
2013-10-23 09:56:24 -07:00
086b82bd69
Fixed sharing dropdown placeholders in IE8/9
...
Added jquery.placeholder shim to handle input field placeholders in IE8/9
2013-10-23 18:51:25 +02:00
1317b7c03d
pass the name of the item source from the browser to the server - no need to get the data via complicated db queries
2013-10-23 18:39:37 +02:00
88c2646f7e
Fixed share dropdown checkbox wrapping
...
The "show cruds" button is now embedded into the last label/checkbox
group and wraps with it.
Added ellipsis to prevent long names to exceed the dropdown's width.
2013-10-23 17:58:27 +02:00
a2e9c0f81a
better wording for share input field and share link
2013-10-23 17:57:06 +03:00
9aa164f381
Renamed current placeholder jquery plugin to imageplaceholder
...
This is to prevent conflicts with jquery libs that handle text
placeholders in IE8
2013-10-23 16:47:25 +02:00
9656280252
Added left padding to notCreatable message
2013-10-23 16:20:53 +02:00
c478a792fb
add missing ;
2013-10-23 10:59:01 +02:00
20716a153a
fix message dialog titles in IE8
2013-10-23 10:58:25 +02:00
45e6d96702
prevent user from creating or renaming sth. to an existing filename
...
- show tooltip when violating naming constraints while typing
- when target filename exists on server fallback to dialog to interrupt the users flow because something unexpected went wrong
- fixes #5062
- also fixes some whitespace and codestyle issues in files js
- uses css selector over filterAttr in touched js files
2013-10-22 18:11:03 +02:00
cadd71ec8a
Merge pull request #5455 from owncloud/fixing-2423-master
...
introduce link_to_docs() and migrate links
2013-10-22 01:28:43 -07:00
6915367622
Merge pull request #5446 from frisco82/fixNotifyUser
...
Fix notify user checkbox
2013-10-21 14:07:33 -07:00
fa1864971e
Merge pull request #5120 from frisco82/sendEmailJS
...
Fix disabled status after sending a share link email
2013-10-21 13:02:52 -07:00
148d2616e5
introduce link_to_docs() and migrate links
2013-10-21 21:29:45 +02:00
635a46b373
Merge pull request #5444 from frisco82/fixDisplayGroup
...
Fix display name for user after sharing
2013-10-21 12:05:14 -07:00
bd7cf436c6
Merge pull request #5441 from owncloud/files-sharewithlinkasnormaluserfix
...
Fixed share with link checkbox missing as regular user
2013-10-21 11:46:01 -07:00
a376407da3
[tx-robot] updated from transifex
2013-10-21 13:03:32 -04:00
b27595888a
fix notify user, and made js more resiliant to changes
2013-10-21 16:14:23 +02:00
85edbb08c1
fix user displayName not being shown after add, added class for improved styling, fix strong for groups when english is not being used
2013-10-21 15:31:31 +02:00
f8717bc260
Fixed share with link checkbox missing as regular user
...
Instead of loading the app config setting "shareapi_allow_links" using a
synchronous ajax call that fails when the user is not an admin, this fix
puts the flag directly in the template so it doesn't need to be loaded
afterwards.
Fixes #5440
2013-10-21 11:29:40 +02:00
f5a6d6b43e
Merge pull request #5200 from owncloud/ie8-warning-fix
...
Fix warning box in IE8
2013-10-20 23:55:18 -07:00
dbcfb1b830
beautify 'you dont have write permissions' notice, fix #2770
2013-10-20 23:15:58 +03:00
84d4d797d1
shorten string to 'notify by email', cut 'user'
2013-10-20 23:04:24 +03:00
fc7269e728
remove hover hide/show stuff for share dropdown to make things more obvious
2013-10-20 23:03:48 +03:00
1e8af6c5ef
bold share username
2013-10-20 22:52:18 +03:00
846ce67d01
properly align checkboxes to text
2013-10-20 22:51:04 +03:00
5b75673e77
more breathing space in share list
2013-10-20 22:48:25 +03:00
fbd0076be0
remove superfluous input hover color change
2013-10-20 22:38:14 +03:00
fa66dfff80
input field background size to white, fix input fields seeming disabled, fix #5168
2013-10-20 21:22:41 +03:00
6aee83cadf
[tx-robot] updated from transifex
2013-10-19 08:27:13 -04:00
b201e87af6
Merge pull request #5338 from frisco82/fixGroupDisplay
...
Show (group) after groups in share dropdown
2013-10-18 05:46:05 -07:00
7297c6a5ef
Merge pull request #5403 from owncloud/fix-breadcrumbs
...
correctly position ... overflow in breadcrumbs, fix #5158
2013-10-18 05:28:48 -07:00
0febccee49
readability: single line -> multiple lines
2013-10-18 10:39:02 +02:00
7f9ff51308
Fix accidental deletion of if
2013-10-18 10:34:31 +02:00
a2c80bbc68
Don't show links option in dropdown if disabled
2013-10-18 10:34:30 +02:00
07b885e291
correctly position ... overflow in breadcrumbs, fix #5158
2013-10-17 21:22:55 +03:00
2845747528
[tx-robot] updated from transifex
2013-10-17 13:48:52 -04:00
01349850b0
Merge pull request #5381 from owncloud/files-sharingstateafterupload
...
Fixed sharing status update for new/uploaded files
2013-10-17 05:51:12 -07:00
8a5c761239
Added missing var in share.js
2013-10-17 14:39:20 +02:00
467f864db4
Fixed sharing status update for new/uploaded files
...
Creating new files, folders or uploading files now have their sharing
icon updated accordingly.
For this, the global share status list that is cached in
OC.Share.statuses is reused for new files.
Performance should improve as the sharing list is now only loaded once
per navigation session.
In OC.Share, split loadIcons into loadIcons + updateIcons.
Fixes #4977
2013-10-17 12:55:10 +02:00
6e1881dbe4
new console command to generate sql migration scripts
2013-10-17 12:51:30 +02:00
e7603aa6b4
Updates ownCloud title to Application - ownCloud
2013-10-17 14:10:06 +05:30
a132144eca
Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix
...
Fixed conflict dialog in IE8
2013-10-16 12:52:41 -07:00
1c4dbaeab1
Fix warning box in IE8
...
* simulates a black transparent background on a blue pane
2013-10-16 21:45:11 +02:00
630be99ddf
[tx-robot] updated from transifex
2013-10-16 00:31:48 -04:00
8c25b5a0c1
Merge pull request #5295 from owncloud/show-eye-in-personal
...
Shows The Eye permanently in the Confirm Password field in Personal Settings
2013-10-15 02:59:53 -07:00
2def1a8853
Removes Bogus showpassword js. thx @PVince81
2013-10-15 14:41:18 +05:30
4eed240296
Should Display PasswordToggle Eye Everywhere.
2013-10-15 11:36:44 +05:30
8ac518bb3e
Show (group) after groups in share dropdown
2013-10-14 20:17:45 +02:00
f3336f8877
[tx-robot] updated from transifex
2013-10-13 20:33:30 -04:00
a021a12b3b
Merge pull request #5253 from owncloud/externalstorage-adminstatusindicator
...
Fixed external storage status indicator in admin page
2013-10-13 13:03:02 -07:00
e961dbaa38
Shows The Eye permanently in the Confirm Password field in Personal Settings - fix #5167
2013-10-12 12:42:23 +02:00
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
8ce3ae50f0
Improve expand/collapse logic
2013-10-11 16:35:59 +03: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
bced346c3b
Now using smaller spinner image for status indicator
...
To make the status indicator appear smaller, even in IE8 that doesn't
support background-size, there is no a smaller animated gif
"loading-small" for that purpose.
2013-10-11 12:36:30 +02:00
44a5b0bad0
[tx-robot] updated from transifex
2013-10-10 22:30:58 -04: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
e2a4417079
Fixed conflict dialog in IE8
...
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
2013-10-10 15:54:00 +02:00
cf554fd804
Merge pull request #5182 from owncloud/fix-sharring-with-password-screen
...
Fix password screen for public shares
2013-10-10 04:49:47 -07:00
d968843bf6
Merge pull request #5244 from owncloud/more-css-fixes
...
More css fixes
2013-10-10 04:48:11 -07:00
6053007768
Merge pull request #5210 from owncloud/sharing_search_users_fix
...
find users which are in the same group
2013-10-10 01:50:51 -07:00
599383c8b1
Merge pull request #5183 from owncloud/login-warningstyle
...
Fixed login warning style
2013-10-09 04:18:14 -07:00
01371e3187
Fixed login warning style #5065
...
Removed bold so it takes less space and set alignment to left.
2013-10-09 11:15:54 +02:00
835f36cb09
find users which are in the same group
2013-10-08 16:43:23 +02:00
209392587f
[tx-robot] updated from transifex
2013-10-08 07:24:19 -04:00
c99c3ea9e6
Optimize confirm.[svg|png] with optipng and scour
2013-10-08 02:40:13 +02:00
c655eec3d1
[tx-robot] updated from transifex
2013-10-07 12:21:38 -04:00
4af220d09e
Fix password screen for public shares
...
* Works in IE8, 9, 10, Firefox 24 and Chromium 30
* Credits to Julian Müller @Julian1998
2013-10-07 17:38:27 +02:00
d8b7e42fc1
Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
...
File conflicts dialog fixes
2013-10-07 08:19:40 -07:00
b48dffa9a3
Merge pull request #5072 from owncloud/apache-auth-master
...
OC6 Apache Authentication
2013-10-07 06:29:56 -07:00
e97aaee1aa
Prevent share dropdown to close too early with autocomplete
...
When clicking on an autocomplete result in the sharing dropdown,
it will mistakenly be detected as being clicked outside and would
trigger the sharing dropdown closing.
This fix adds a check to detect clicks inside the autocomplete and
prevent closing the dropdown in that case.
This fixes #4142
2013-10-07 13:26:46 +02:00
68fbd7b922
Fixed label for sharing notification to be clickable
...
Fixed the sharing notification checkbox label in the file sharing
dropdown, which makes it possible to click on the label directly.
2013-10-07 13:15:25 +02:00
27579f36f6
Prevent scroll up when click on links in sharing dropdown
...
When clicking on a link that points to "#" in the sharing dropdown, and
the current view is scrolled down, the browser will scroll the page up
to the top (anchor behavior).
This fix cancels the click event when clicking on "unshare" link or
"show crud" link.
2013-10-07 13:11:34 +02:00
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
09d2ba017e
fix undefined $htaccessWorking
2013-10-07 00:36:42 +02: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
4687d2dd0b
All Core Styles from em->px, apart from styles.css
2013-10-07 00:01:29 +05:30
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
8b62b2684a
Fix disabled status after sending the email
2013-10-04 13:10:51 +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
a90ea2c069
Merge remote-tracking branch 'origin/master' into setup
2013-10-02 18:23:59 +02:00
5db98aadd3
Copyright and small fix
2013-10-02 18:23:47 +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
071b8033cb
fixing typo on $htaccessWorking - testing own code before pushing is appreciated
2013-09-24 00:44: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
339c98e5e6
Merge pull request #4835 from owncloud/fix-apps-height
...
use lineheight instead of padding and height
2013-09-15 07:08:50 -07:00
58e6582056
Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter
...
Fixes #4465 - Added autoFocus to #shareWith autocomplete options
2013-09-15 03:07:11 -07:00
db7e1dd877
Merge pull request #4853 from owncloud/external-shared_mimetype-icons
...
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-15 02:42:14 -07:00
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
a0c2c2473a
Merge pull request #4501 from owncloud/ajaxfilelist
...
Ajax calls for "files" and "files_trashbin" apps
2013-09-14 12:51:16 -07:00
dcc899d0a0
Merge pull request #4806 from owncloud/oc-dialogs-pageleave
...
Don't popup meaningless alerts when dialog called on page leave
2013-09-14 10:35:39 -07:00
c117e719da
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-14 14:35:23 +02:00
86143beb6a
Remove superfluous $
2013-09-14 14:15:52 +02:00
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
1304b511e9
Ajax calls for "files" and "files_trashbin" apps
...
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list
Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
functions
- Fixed some file paths in trashbin app to be similar to the files app
2013-09-13 19:59:14 +02:00
666bbbe060
Use appinfo/register_command.php to add commands to the console command
2013-09-13 18:10:04 +02:00
5633291cef
use lineheight instead of padding and height
2013-09-13 15:53:03 +02:00
a3705ce188
Merge branch 'master' into setup
...
Conflicts:
lib/util.php
2013-09-12 22:45:11 +02:00
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
b7205d97d7
Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist
...
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
2013-09-11 17:18:04 -07:00
80bf1969f9
Merge pull request #4784 from owncloud/ocdialog_option_setter
...
Fix setting ocdialog options after initialization.
2013-09-11 12:20:17 -07:00
08225a60c8
Save two lines
2013-09-11 21:15:32 +02:00
1f8f0e61d8
Remove test error :P
2013-09-11 21:11:35 +02:00
7a2b23a036
Fix double destroy on escape.
2013-09-11 17:13:39 +02:00
15be3d85b6
no autoFocus if no users returned
2013-09-11 15:59:28 +01:00
037cf22c51
Add a comment to clear defaultavatar-functionality
2013-09-11 16:04:41 +02:00
799c5c2c9b
Don't popup meaningless alerts when dialog called on page leave
2013-09-11 16:02:12 +02:00
68015b2761
[tx-robot] updated from transifex
2013-09-11 06:50:06 -04:00
92b57c13c1
Added autoFocus to #shareWith autocomplete options
2013-09-11 11:45:32 +01:00
bf7f94422f
Bring another enable_avatars to $_ and fix $thus->$this
2013-09-11 07:11:33 +02:00
65aab3dc8c
Check for failure in creating htaccessWorking testfile
2013-09-10 22:05:20 +02:00
8ae612f693
Move core setup code to controller class
2013-09-10 20:19:42 +02:00
cec932f292
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/file-upload.js
2013-09-10 16:54:48 +02:00
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
fdfdd2e4e7
Remove console logging
2013-09-10 00:25:07 +02:00
51547c3316
Fix setting ocdialog options after initialization.
2013-09-10 00:21:42 +02:00
1832eb8872
Pass view in \OC_Avatar to constructor and use $_ for enable_avatars
2013-09-09 16:57:46 +02:00
92f6c3bb10
[tx-robot] updated from transifex
2013-09-08 21:37:53 -04:00
e17c40acb7
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
2013-09-08 17:31:49 +02:00
bd1d5b69fb
fix ESC for conflicts dialog
2013-09-08 17:31:12 +02:00
564de4bc3f
Optimize triangle-e.png and triangle-e.svg
2013-09-08 15:18:23 +02:00
0a0410815e
close and destroy dialog on ESC
2013-09-08 10:11:35 +02:00
00cc83e3f7
show preview for uploading image files on conflict
2013-09-07 14:58:51 +02:00
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
ce03501646
fine ie8 compatability
2013-09-06 23:44:40 +02:00
673e0c01a7
fix page leaving checks
2013-09-06 22:40:10 +02:00
02d14aee17
completely remove dialog on cancel/continue
2013-09-06 16:50:45 +02:00
d18a070a03
Have the "notsquare" error as data, not as message
2013-09-06 13:46:50 +02:00
4d04dd9c4c
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-06 13:42:05 +02:00
c6ca9c1e9d
Use shorter array-conversion
2013-09-06 13:33:17 +02:00
4629d6ad67
Merge pull request #4704 from owncloud/rename-lostpassword-controller
...
Use the namespaced variation of the classname.
2013-09-05 14:38:03 -07:00
3774632ecc
Clean up avatars and preliminary use JSON->rawlist.php
2013-09-05 23:12:52 +02:00
f84fe479a5
Only use mimetype_list and clean up a bit
2013-09-05 18:40:55 +02:00
8a7e26b268
cleanup dead code
2013-09-05 17:46:19 +02:00
992b59f70b
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
2013-09-05 16:54:12 +02:00
f8563ec583
Merge branch 'master' into sharing_mail_notification_master
...
increased version number to trigger db update
Conflicts:
lib/util.php
2013-09-05 13:39:45 +02:00
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
bbf8acb383
separate uploading code from progress code, add progress capability detection
2013-09-05 10:19:54 +02:00
6db96603a0
Have login-checks and CSRF checks
2013-09-05 00:04:31 +02:00
8fd76e39cf
Use proper controller naming
2013-09-04 22:22:56 +02:00
b643c02bd5
Fix some bugs and remove \OCP\Avatar for now
2013-09-04 22:13:59 +02:00
68dce9dde5
fixing style, var name & PHPDoc
2013-09-04 21:22:36 +02:00
e43e8b0db8
Merge branch 'master' into rename-lostpassword-controller
...
Conflicts:
core/lostpassword/controller.php
2013-09-04 20:46:32 +02:00
49fd7e9f1e
refactor dialog creation
2013-09-04 16:42:18 +02:00
4af5a8c483
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/templates/part.list.php
2013-09-04 14:11:40 +02:00
820fd42161
Merge branch 'master' into oc_avatars
2013-09-04 12:56:40 +02:00
a1e7614d73
Clean up oc_avatars
2013-09-04 12:56:14 +02:00
09187f3b3b
Merge pull request #4449 from owncloud/clean_up_util
...
Clean up \OC\Util
2013-09-03 22:53:03 -07:00
6435e18e95
Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker
...
Add previews to OC.dialogs.filepicker()
2013-09-03 22:35:58 -07:00
b1d20e0470
Have the header avatar to the left of the user name
2013-09-03 21:44:32 +02:00
6d42f51d0c
Fix unwanted caching in IE8
2013-09-03 18:34:40 +02:00
ce263df4c7
Don't use HTML5 <header> to support avatars in IE8
2013-09-03 16:52:15 +02:00
c2eaf7589d
Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bind
...
use on to add event listener instead of deprecated jquery bind
2013-09-03 06:27:08 -07:00
d62c5063f4
Add previews to OC.dialogs.filepicker(); Fix #4697
2013-09-03 15:15:20 +02:00
85758f3d7d
Merge pull request #4473 from owncloud/texteditor_polishing
...
Texteditor polishing
2013-09-03 05:38:59 -07:00
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
fd7469db9e
coding-style fixes
2013-09-03 13:37:06 +02:00
b0c6f990e4
use on to add event listener instead of deprecated jquery bind
2013-09-03 13:12:19 +02:00
84aba4542d
Merge pull request #4702 from owncloud/center-utils
...
center utils
2013-09-03 02:27:52 -07:00
2da6f6b4ce
Merge pull request #4695 from owncloud/placeholder-hsl
...
RGB -> HSL
2013-09-03 02:18:39 -07:00
65413a95dc
Merge branch 'master' into oc_avatars
...
Conflicts:
config/config.sample.php
2013-09-03 04:43:11 +02:00
53a7f80ac3
Use provided mimetype on open. Fix #4696
2013-09-02 23:53:45 +02:00
5539b9e843
Use the namespaced variation of the classname.
2013-09-02 21:25:32 +02:00
87035fc478
center utils
2013-09-02 19:38:47 +02:00
9eeb27c91a
placeholder.js: fix typo
2013-09-02 18:29:16 +02:00
57a1219ca0
placeholder.js: adjust saturation and lightness values
2013-09-02 18:20:18 +02:00
44b3e71ed4
Cleanup and more style fixes
2013-09-02 18:20:04 +02:00
e7e3f1b81a
Fix some of @jancborchardt's complaints in oc_avatars
2013-09-02 17:07:38 +02:00
e7a14ea32d
RGB -> HSL
2013-09-02 16:41:18 +02:00
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
a2f18eabb1
Merge pull request #4657 from owncloud/files-controls-fixes
...
Files controls fixes
2013-09-01 23:08:23 -07:00
8a4acf263e
Merge pull request #4674 from owncloud/fit-filepicker-new-icons
...
Fit filesummary for \OC\Preview's new mimetype-icons
2013-09-01 23:06:59 -07:00
1e501a8521
IE8 fixes
2013-09-02 08:05:47 +02:00
e5fc7b9dbe
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/base.php
2013-09-02 07:58:06 +02:00
f038cb9aea
Merge pull request #4671 from owncloud/emptycontent
...
centers text message in empty-content page (files and files_trashbin apps)
2013-09-01 17:47:55 -07:00
14cc1cd4b8
Pass setLastModifiedHeader() time()
2013-09-01 23:25:50 +02:00
5c1d64b80e
$image doesn't have data() when a defaultavatar should be used
2013-09-01 23:15:45 +02:00
91fed38f00
Also set an E-Tag header
2013-09-01 23:07:38 +02:00
Jenkins for ownCloud
Andreas Fischer
ringmaster
Morris Jobke
Julian Müller
Vincent Petry
Arthur Schiwon
Ramiro Aparicio
Jan-Christoph Borchardt
Jörn Friedrich Dreyer
Frank Karlitschek
Michael Gapczynski
raghunayyar
Victor Dubiniuk
Thomas Tanghus
Jake Wilson
Björn Schießle
Bjoern Schiessle
kondou
VicDeo
Owen Winkler
vsapronov
Bart Visscher
Alessandro Cosentino
Bernhard Posselt
Bernhard Posselt
Pete McFarlane
Robin Appelman