Commit Graph
17214 Commits
Author SHA1 Message Date
Individual IT ServicesandDaniel Molkentin 9a0fba5f5e checking if file or folder is to be shared to fix issue #3556 2015-08-18 11:46:29 +02:00
Daniel Molkentin 22d87218b7 Merge pull request #3601 from individual-it/master
checking if file or folder is to be shared to fix issue #3556
2015-08-18 11:45:31 +02:00
Daniel Molkentin bd39543542 Merge pull request #3623 from owncloud/phil-davis-conffile-20
Conffile doc typo 2.0
2015-08-18 11:13:46 +02:00
Daniel Molkentin 49949084fb Merge pull request #3628 from owncloud/phil-davis-FAQ-20
FAQ Doc typo 2.0
2015-08-18 11:13:26 +02:00
Daniel Molkentin b584f37906 Merge pull request #3627 from owncloud/phil-davis-troubleshooting-20
Troubleshooting Doc minor typos 2.0
2015-08-18 11:13:17 +02:00
Daniel Molkentin 70f3b91a1e Merge pull request #3626 from owncloud/phil-davis-architecture-20
Architecture Doc typos and formatting 2.0
2015-08-18 11:10:54 +02:00
Daniel Molkentin 15545168d4 Merge pull request #3625 from owncloud/phil-davis-building-20
Building Doc minor corrections 2.0
2015-08-18 11:10:38 +02:00
Daniel Molkentin 2d797c9408 Merge pull request #3624 from owncloud/phil-davis-autoupdate-20
Autoupdate Doc bullet point rendering 2.0
2015-08-18 11:10:35 +02:00
Daniel Molkentin 8d5ffccaf1 Merge pull request #3622 from owncloud/phil-davis-navigating-20
Navigating doc typos 2.0
2015-08-18 11:10:29 +02:00
Daniel Molkentin 855947751e Merge pull request #3621 from owncloud/phil-davis-installing-20
Installing doc typo 2.0
2015-08-18 11:10:04 +02:00
Markus Goetz 9dd9a9a524 Exclude file: Add syncform files #3640 2015-08-18 11:06:26 +02:00
Jenkins for ownCloud 554e5b8f73 [tx-robot] updated from transifex 2015-08-18 02:19:12 -04:00
Jenkins for ownCloud f368c0e379 [tx-robot] updated from transifex 2015-08-18 01:15:36 -04:00
Olivier Goffart f0e6864639 FolderModel: Refresh the tree when new folder are added or removed. #3570 2015-08-17 12:50:22 +02:00
Markus Goetz 6c57d71ca4 Settings dialog: Move more common hostname prefixes in toolbar
For #3577
2015-08-17 12:39:32 +02:00
Olivier Goffart 64bd6b204b Folder Wizard: always make an alias that does not conflict with anything 2015-08-17 11:54:01 +02:00
Olivier Goffart 7ca8040788 Show a shortened version of the path in the account settings and activity
Issue #3576, #3567
2015-08-17 11:43:30 +02:00
Jenkins for ownCloud c98ee987cd [tx-robot] updated from transifex 2015-08-17 02:18:50 -04:00
Jenkins for ownCloud bd16ad4783 [tx-robot] updated from transifex 2015-08-17 01:15:27 -04:00
Jenkins for ownCloud 6aea40534e [tx-robot] updated from transifex 2015-08-16 02:18:46 -04:00
Jenkins for ownCloud 309e0c5902 [tx-robot] updated from transifex 2015-08-15 02:19:01 -04:00
Daniel Molkentin 7317e9af61 No beta note in nightly builds 2015-08-15 02:56:30 +02:00
Olivier Goffart bfb637e64d Fix build with old cmake
DIRECOTRY is new in 2.8.12.
Uses PATH instead
2015-08-14 14:21:40 +02:00
Phil Davis e54bbcd15f FAQ Doc typo 2015-08-14 17:48:37 +05:45
Phil Davis 149d6c32c1 Troubleshooting Doc minor typos 2.0 2015-08-14 17:46:42 +05:45
Olivier Goffart 0da6184f84 Setup Wizard: adjust the layout #3588 2015-08-14 14:01:01 +02:00
Phil Davis 0ca3df917e Architecture Doc typos and formatting 2.0 2015-08-14 17:43:36 +05:45
Phil Davis 12fe59e3ce Building Doc minor corrections 2015-08-14 17:41:02 +05:45
Phil Davis 3bfb8f6906 Autoupdate Doc bullet point rendering 2.0
A space at the start of the bullet point about "Locate and open the following file" seems to be causing that bullet point to not line up nicely on the rendered page.
2015-08-14 17:38:41 +05:45
Phil Davis 7527ee0cd3 Conffile doc typo 2015-08-14 17:35:18 +05:45
Phil Davis 080ec49fae Navigating doc typos
Some "downloading" that should be "uploading".
Some bullet points with "code" items were rendering with bold, italics on the published page. These seemed to be bullet points that had 3 spaces at the start of their 2nd line of text. Other bullet points that rendered correctly had only 2 spaces. So I removed the extra space. I hope it renders nicely in the published form - it is a bit hard to know in the GitHub Preview, because that is trying to show change-sidebars and differences also.
2015-08-14 17:32:32 +05:45
Phil Davis fe92186ce0 Installing doc typo 2.0 2015-08-14 17:28:47 +05:45
Olivier Goffart ab52c8bcd7 Merge #3611 2015-08-14 13:32:48 +02:00
Markus Goetz 485dde8fb5 VERSION.cmake: Bump to 2.0 beta2 v2.0.0-beta2 2015-08-14 12:37:41 +02:00
Markus Goetz 1ad80878b2 Account: Additional on top fix for #3617 2015-08-14 12:37:19 +02:00
Olivier Goffart 81c19232a5 Account Settings: Remove the ability to select 2015-08-14 12:12:16 +02:00
Markus Goetz fd83ee64af ChangeLog: Mention 1.8.4, reorder things 2015-08-14 12:01:11 +02:00
Olivier Goffart dcfa6b97e3 Account Settings: add more margin on the overall text
Attempt to fix https://github.com/owncloud/client/issues/3584#issuecomment-131009787
2015-08-14 12:01:28 +02:00
Olivier Goffart 593016718d Account Settings: Align the progressbar with the icon #3567 2015-08-14 11:52:09 +02:00
Olivier Goffart 2dbe822972 Account Settings: remove the storage use label #3567 2015-08-14 11:52:09 +02:00
Markus Goetz 38b8508f15 Account: Save accepted SSL certs immediatly #3617 2015-08-14 11:31:01 +02:00
Klaas FreitagandMarkus Goetz 76ce5adbf0 Abort the request and reset the QNAM if user does not ACK a new cert.
This is supposed to fix bug #3283

(cherry picked from commit 75b38d1a2f)
2015-08-14 10:31:20 +02:00
Jenkins for ownCloud 9f27cc1fac [tx-robot] updated from transifex 2015-08-14 02:18:56 -04:00
Markus Goetz 2a14c121db Account settings: Make version selectable/copyable #3600 2015-08-13 17:27:18 +02:00
Markus Goetz 01855302a0 Shibboleth: Use sslErrors() handler of rest of client #3593 2015-08-13 17:09:39 +02:00
Markus Goetz 62d64acd7b Merge pull request #3589 from owncloud/sharedir
Use SHAREDIR for i18n dir
2015-08-13 16:02:11 +02:00
Olivier Goffart 5c9b865cec Setup wizard: remove some spacing in the result page #3588 2015-08-13 15:22:43 +02:00
Olivier Goffart 5f832b5b39 Account Settings: Reorder the options in the context menu #3584 2015-08-13 15:07:51 +02:00
Olivier Goffart b75b5a5a0c Account Settings: remove the down arrow in the 'more' button #3584
It's ugly on mac
2015-08-13 14:11:13 +02:00
Olivier Goffart f32c8d0570 Account settings: add a button to show the context menu #3584 2015-08-13 12:34:22 +02:00