wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
24139 commits 157 branches 562 tags 714 MiB
Commit graph

4007 commits

Author SHA1 Message Date
Jan-Christoph Borchardt
6b8f5abf98 detail corrections for search box layout 2015-03-26 15:06:11 +01:00
Jan-Christoph Borchardt
fd9214de23 fix user dropdown for IE8 2015-03-26 15:02:31 +01:00
Jan-Christoph Borchardt
f0b0287333 adjust animations of Share, Versions and others to OC.menuSpeed 2015-03-26 12:21:40 +01:00
Jan-Christoph Borchardt
30b745fc59 reintroduce quick animation for menus 2015-03-26 11:59:30 +01:00
Jenkins for ownCloud
b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Vincent Petry
ca6b715b31 Added ext storage mount options GUI 
Added option to disable autoscan of external storages
Mount option file system scan is now an int
Move priority field to avoid undefined field in storage options

All input elements inside the storage options block get parsed into
storage options.

Moving the priority field outside prevents it to appear in the storage
config, as expected. It is still parsed by special code.
 2015-03-26 11:21:03 +01:00
Jan-Christoph Borchardt
07335c844a fix log in issue, fix arrow position, make dropdown work in Firefox 2015-03-26 11:12:02 +01:00
Jan-Christoph Borchardt
cd88ddddaf fix accessibility of ownCloud logo and navigation entries, fix #15013g 2015-03-26 10:31:00 +01:00
Jenkins for ownCloud
40b77eb97a [tx-robot] updated from transifex 2015-03-26 01:55:29 -04:00
Jan-Christoph Borchardt
d7414fbf0d move triangle of apps dropdown to align with app name triangle 2015-03-26 00:43:11 +01:00
Jan-Christoph Borchardt
dd7eb4c7c3 reduce logo size a bit for a better look 2015-03-26 00:43:11 +01:00
Jan-Christoph Borchardt
4546a33d58 adjust share dropdown border radius to 3px 2015-03-26 00:43:11 +01:00
Jan-Christoph Borchardt
70a4df1418 more small fixes in header 2015-03-26 00:43:11 +01:00
Jan-Christoph Borchardt
ad596a0198 further adjustments of header and dropdown styles 2015-03-26 00:41:41 +01:00
Jan-Christoph Borchardt
095197d1a7 popover style for apps and user dropdown menus 2015-03-26 00:40:30 +01:00
Morris Jobke
285f9e32e5 Merge pull request #15190 from owncloud/hide-update-notification-on-mobile 
do not show update notification on mobile, fix overlapping of header menus
 2015-03-25 15:48:34 +01:00
Jan-Christoph Borchardt
090eb832f0 do not show update notification on mobile, fix overlapping of header menus, fix #10544 2015-03-25 12:43:05 +01:00
Jan-Christoph Borchardt
fa43480b55 highlight active user menu entry 2015-03-25 09:27:43 +01:00
Jan-Christoph Borchardt
e188f0e436 Merge pull request #14970 from owncloud/sidebar-enhancements 
sidebar fixes
 2015-03-25 09:16:49 +01:00
Jenkins for ownCloud
fb61889490 [tx-robot] updated from transifex 2015-03-25 01:55:46 -04:00
Roeland Jago Douma
4163a5efad Call the proper function 
* Fix for #6967
 2015-03-24 21:45:31 +01:00
Morris Jobke
968fca8b55 Merge pull request #15048 from owncloud/avatar-crop-square 
round width and height when cropping avatar
 2015-03-24 15:23:14 +01:00
Daniel Hansson
8ee1fa98df Don't use hardcoded date and time 
Use local time instead. http://momentjs.com/
 2015-03-24 13:41:55 +01:00
Jan-Christoph Borchardt
83580d08eb Merge pull request #15143 from owncloud/24h-time-format 
Use 24h format instead of 12h format
 2015-03-24 13:30:52 +01:00
Morris Jobke
c8af615c01 Merge pull request #15142 from owncloud/issue/15138-feedback-for-empty-apps-list 
Issue/15138 feedback for empty apps list
 2015-03-24 13:02:56 +01:00
Morris Jobke
e07a2fd8a2 Merge pull request #15012 from Volker-E/master 
fixing #15011 by adding ARIA roles where distinct
 2015-03-24 12:07:26 +01:00
Joas Schilling
17fbffceeb Use the same style when no search result was found 2015-03-24 11:29:29 +01:00
Joas Schilling
c3c2517131 Display a message when no apps can be found for this oc version 2015-03-24 11:29:28 +01:00
Daniel Hansson
946a7c3a83 Use 24h format instead of 12h format 
Use correct time format in WebUI
 2015-03-24 11:20:20 +01:00
Vincent Petry
ce5d2ab7db Revert "Change to 24H format instead of 12H format" 
This reverts commit 8279dde97a.
 2015-03-24 11:08:53 +01:00
Jenkins for ownCloud
9cb07f126d [tx-robot] updated from transifex 2015-03-24 01:55:24 -04:00
Daniel Hansson
8279dde97a Change to 24H format instead of 12H format 
Update how the time shows in WebUI.

My first PR to core, woha. :)
 2015-03-23 22:05:44 +01:00
Morris Jobke
10eeb35167 Merge pull request #15121 from owncloud/email-sent-unbold 
unbold share email sent notification
 2015-03-23 18:57:20 +01:00
Morris Jobke
0adcb99110 Merge pull request #14862 from owncloud/introduce-shipped.json-master 
shipped apps are now defined in core/shipped.json - the shipped tag in i...
 2015-03-23 17:17:33 +01:00
Jan-Christoph Borchardt
fd8a134dd2 unbold share email sent notification 2015-03-23 16:53:20 +01:00
Thomas Müller
33cd60ab9a adding enterprise apps to shipped.json 2015-03-23 15:11:16 +01:00
Jan-Christoph Borchardt
5130eca3e3 combine labels with inputs in sharing dialog, fix #14796 2015-03-23 14:40:56 +01:00
Jenkins for ownCloud
a9b4f0d842 [tx-robot] updated from transifex 2015-03-23 01:54:48 -04:00
Jenkins for ownCloud
a79d973005 [tx-robot] updated from transifex 2015-03-22 01:55:21 -04:00
Volker E
599ee5ce4e fixing #15023, getting comments out of HTML output 2015-03-21 07:10:46 +01:00
Jenkins for ownCloud
e36a33c89a [tx-robot] updated from transifex 2015-03-21 01:56:09 -04:00
Thomas Müller
afa8872955 Merge pull request #14857 from owncloud/preview-provider-registration-in-manager 
Preview provider registration in manager
 2015-03-20 16:34:22 +01:00
Vincent Petry
e44ab2dcfe Merge pull request #11884 from owncloud/ext-appframework 
Cleanup ext storage CRUD code, introduce storage config id
 2015-03-20 14:17:32 +01:00
Robin McCorkell
b6676c32d6 Merge pull request #15046 from owncloud/exception-show-type 
show exception type in debug mode
 2015-03-20 08:48:22 +00:00
Jenkins for ownCloud
e8680e6637 [tx-robot] updated from transifex 2015-03-20 01:55:23 -04:00
Robin Appelman
bd1d7107bb round width and height when cropping avatar 2015-03-20 04:08:24 +01:00
Robin Appelman
2df20aaffb show exception type in debug mode 2015-03-20 03:51:21 +01:00
Volker E
0e4d52f9d2 fixing #15027, cleaning up obsolete IE5-7 workaround code 2015-03-19 09:10:58 +01:00
Jenkins for ownCloud
e40b0701d7 [tx-robot] updated from transifex 2015-03-19 01:55:06 -04:00
Volker E
0d0c73cf2b fixing #15011 by adding ARIA roles where distinct 2015-03-18 19:29:15 +01:00
Jan-Christoph Borchardt
e5fd6816df fix position of 'Deleted files' sidebar entry, fix #10815 2015-03-18 13:31:16 +01:00
Jan-Christoph Borchardt
093efa458c Merge pull request #14981 from Volker-E/master 
addressing #14978 - remove html root classes targeting IE6/IE7
 2015-03-18 11:24:42 +01:00
Jenkins for ownCloud
8a95bf18b7 [tx-robot] updated from transifex 2015-03-18 01:55:22 -04:00
Volker E
790324b313 addressing #14984 removing redundant type attributes 2015-03-18 05:33:17 +01:00
Volker E
4c46d0c46c addressing #14983 obsolete Google Chrome Frame 2015-03-18 02:11:47 +01:00
Volker E
6ad76b5cc2 addressing #14982 self-closing tags ending slash doesn't have a purpose & should be removed 2015-03-17 23:57:23 +01:00
Volker E
25b77159c4 adressing #14979 meta charset declaration should be first in head 2015-03-17 23:36:05 +01:00
Volker E
e8c99a60ec addressing #14978 - remove html root classes targeting IE6/IE7 2015-03-17 23:16:42 +01:00
Volker E
f3cd552797 addressing #14978 - remove html root classes targeting IE6/IE7 2015-03-17 22:35:20 +01:00
Jan-Christoph Borchardt
ccc9db6c54 add bottom padding to sidebar, fix last element being hidden below settings, fix #13264 2015-03-17 18:42:11 +01:00
Jan-Christoph Borchardt
37a41dad56 add more whitespace to share link options in dropdown for better clickability and look 2015-03-17 18:19:45 +01:00
Jan-Christoph Borchardt
6ac677f17a fix checkbox alignment in share dialog, fix #11515 2015-03-17 18:18:07 +01:00
Lukas Reschke
b1c19f74a1 Merge pull request #12085 from owncloud/add-swift-mailer 
Migrate OC_Mail to SwiftMailer
 2015-03-17 11:15:39 +01:00
Jenkins for ownCloud
b51b4f0a2c [tx-robot] updated from transifex 2015-03-17 01:55:43 -04:00
Lukas Reschke
283476a2f7 Use new IMailer and add unit-tests for lostcontroller 2015-03-16 12:47:05 +01:00
Lukas Reschke
13486a5ada Migrate to SwiftMail 
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.

Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014

Conflicts:
	3rdparty
	lib/private/server.php
	lib/public/iservercontainer.php
	tests/lib/mail.php
	tests/settings/controller/mailsettingscontrollertest.php

Conflicts:
	3rdparty
	lib/private/mail.php
	lib/private/server.php
	lib/public/iservercontainer.php
	settings/ajax/lostpassword.php
	settings/application.php
 2015-03-16 12:47:05 +01:00
Joas Schilling
8ed27d2ce0 Create an interface for OC_Image and OCP\Image for the public API 2015-03-16 12:45:15 +01:00
Joas Schilling
4c4c0fa120 Use the PreviewManager where possible 2015-03-16 12:44:10 +01:00
Thomas Müller
c262d0d966 Update shipped.json 2015-03-16 11:59:40 +01:00
Jenkins for ownCloud
c1a3394f48 [tx-robot] updated from transifex 2015-03-16 01:55:15 -04:00
Joas Schilling
5d71eb5670 Color avatars of non-existing users gray and display X instead 2015-03-13 15:29:52 +01:00
Joas Schilling
8304f5f508 Fix getting the avatar of a non-existing user 2015-03-13 15:29:52 +01:00
Thomas Müller
40b2889785 shipped apps are now defined in core/shipped.json - the shipped tag in info.xml is ignored from now on - never trust an app 🙊 2015-03-13 11:18:39 +01:00
Jenkins for ownCloud
d17630d6be [tx-robot] updated from transifex 2015-03-13 01:54:55 -04:00
Vincent Petry
ce94a998dd Use storage id + appframework for ext storage CRUD 
- Added StorageConfig class to replace ugly arrays
- Implemented StorageService and StorageController for Global and User
  storages
- Async status checking for storages (from Xenopathic)
- Auto-generate id for external storage configs (not the same as
  storage_id)
- Refactor JS classes for external storage settings, this mostly
  moves/encapsulated existing global event handlers into the
  MountConfigListView class.
- Added some JS unit tests for the external storage UI
 2015-03-12 18:51:02 +01:00
Morris Jobke
89e1b920cc Merge pull request #14613 from kampka/no-table-prefix 
Install command should not require table prefix
 2015-03-12 10:06:21 +01:00
Jenkins for ownCloud
454a2563bc [tx-robot] updated from transifex 2015-03-12 01:55:59 -04:00
Christian Kampka
277503209a Install command should not require table prefix 2015-03-11 21:06:25 +01:00
Lukas Reschke
f9fd1629da Merge pull request #14705 from rullzer/avatarcontroller 
Move AvatarController to AppFramework
 2015-03-11 17:15:42 +01:00
Roeland Jago Douma
1a0f9c375b Avatar controller moved to AppFrameWork 
* Original avatarcontroller migrated to the appframework
* Added DataDisplayResponse that show data inline in the browser (used
  to retrun the image)
* Removed some unneeded code
* Added unit tests for the avatarcontroller
 2015-03-11 16:37:42 +01:00
Lukas Reschke
73dc02d42c Merge pull request #14798 from owncloud/enable-oci-autotest-master 
Setting oci as supported database
 2015-03-11 16:14:54 +01:00
Morris Jobke
caa672ceeb Merge pull request #14794 from owncloud/add-console-command-user-add 
Add a console command user:add to create users over the console
 2015-03-11 16:09:23 +01:00
Thomas Müller
96b223676d Don't play with config values ... 2015-03-11 15:47:24 +01:00
Thomas Müller
cba3ec2c7f Setting oci as supported database 2015-03-11 14:29:22 +01:00
Joas Schilling
b1ff21ee28 Add a console command user:add to create users over the console 2015-03-11 14:22:23 +01:00
Morris Jobke
ad97ceb787 Merge pull request #13513 from owncloud/repair-legacystoragenofatalfail 
Do not abort when meeting unfixable legacy storages
 2015-03-11 13:32:33 +01:00
Thomas Müller
b3bb65eae5 Merge pull request #14662 from owncloud/issue/14661-show-versions-in-occ-applist 
Add an option to include the installed app version in "occ app:list"
 2015-03-11 12:23:22 +01:00
Joas Schilling
560137ca23 Always include the installed app version in "occ app:list" 2015-03-11 09:47:41 +01:00
Thomas Müller
6c1a1234f8 Properly handle available databases at runtime and respect setup checks in command line as well 2015-03-11 09:27:12 +01:00
Jenkins for ownCloud
01ea056ac8 [tx-robot] updated from transifex 2015-03-11 01:55:38 -04:00
Jenkins for ownCloud
e069d9d3f9 [tx-robot] updated from transifex 2015-03-10 01:55:39 -04:00
Lukas Reschke
c0a02f1615 Verify CSRF token already in update.php and not the EventSource code 
Issue report:
> Hum, well I upgraded the package then visited the web interface to
trigger the update and it failed; the UI would say there was a
possible CSRF attack and after that it'd be stuck in maintenance mode.
Tried a few times (by editing maintenance to false in owncloud.conf)
and same result each time.

That smells partially like an issue caused by our EventSource implementation, due to legacy concerns the CSRF verification happens within the EventSource handling and not when the actual endpoint is called, what happens here then is:

1. User has somehow an invalid CSRF token in session (or none at all)
2. User clicks the update button
3. Invalid CSRF token is sent to update.php - no CSRF check there => Instance gets set in maintenance mode
4. Invalid CSRF token is processed by the EventSource code => Code Execution is stopped and ownCloud is stuck in maintenance mode

I have a work-around for this problem, basically it verifies the CSRF token already in step 3 and cancels execution then. The same error will be shown to the user however he can work around it by refreshing the page – as stated by the error. I think that’s an acceptable behaviour for now: INSERT LINK

To verify this test:

1. Delete your ownCloud cookies
2. Increment the version in version.php
3. Try to upgrade
=> Before the patch: Instance shows an error, is set to upgrade mode and a refresh does not help
=> After the patch: Instance shows an error, a refresh helps though.

This is not really the best fix as a better solution would be to catch such situations when bootstrapping ownCloud, however, I don’t dare to touch base.php for this sake only, you never know what breaks then…

That said: There might be other bugs as well, especially the stacktrace is somewhat confusing but then again it installing ownCloud under /usr/share/owncloud/ and I bet that is part of the whole issue ;-)
 2015-03-09 10:07:30 +01:00
Morris Jobke
674654c210 Merge pull request #14743 from owncloud/autoconfig-password 
Convert 'abcpassword' to 'abcpass' during setup
 2015-03-09 07:54:22 +01:00
Jenkins for ownCloud
174f8cef64 [tx-robot] updated from transifex 2015-03-09 01:54:36 -04:00
Jenkins for ownCloud
377165ae51 [tx-robot] updated from transifex 2015-03-08 01:54:36 -05:00
Robin McCorkell
f43b047636 Convert 'abcpassword' to 'abcpass' during setup 
This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which
is more consistent with config.php
 2015-03-07 13:10:43 +00:00
Jenkins for ownCloud
73c2157171 [tx-robot] updated from transifex 2015-03-07 01:54:37 -05:00
Jenkins for ownCloud
d11f040720 [tx-robot] updated from transifex 2015-03-06 01:54:52 -05:00
Morris Jobke
f507601e25 Merge pull request #14582 from rullzer/avatar_fixes 
Avatars in share dialog fixes
 2015-03-04 10:30:09 +01:00
Morris Jobke
f1d74e8803 Merge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins 
Let users configure security headers in their Webserver
 2015-03-04 09:36:01 +01:00