Bjoern Schiessle
5dd48347ea
fix references in the federation app
2016-06-20 15:02:58 +02:00
Bjoern Schiessle
299f854f00
fix references in the federated files sharing provider
2016-06-20 14:50:13 +02:00
Björn Schießle
eabf633d66
Merge pull request #161 from nextcloud/stable9-backport-160
...
[stable9] fix translations
2016-06-20 13:09:47 +02:00
Morris Jobke
3a4a0ef009
fix translations
2016-06-20 08:51:26 +02:00
Morris Jobke
03dfb22b46
Merge pull request #134 from hailthemelody/stable9-backport-updater-url
...
[stable9] revise updater.server.url to reflect nextcloud.org URL
2016-06-19 10:27:44 +02:00
=
6d9a4759d8
revise updater.server.url to reflect nextcloud.org URL, also it's comment
2016-06-16 10:55:25 -04:00
Marius Blüm
bbfd0e2821
Merge pull request #118 from nextcloud/stable9-backport-111
...
[stable9] Fix strengthify issues
2016-06-15 18:57:40 +02:00
Morris Jobke
ac5122f45a
fix strengthify in personal settings
2016-06-15 17:54:57 +02:00
Morris Jobke
91b089855a
fix setup page strengthify
...
* fixes #105
2016-06-15 17:54:54 +02:00
Morris Jobke
957d35f590
Update strengthify to 0.5.1
2016-06-15 17:54:49 +02:00
Marius Blüm
fff42812c7
Merge pull request #114 from nextcloud/stable9-fix-more-button
...
[stable9] fix padding of 3-dot button on mobile
2016-06-15 17:32:23 +02:00
Morris Jobke
ae8f750039
Merge pull request #109 from nextcloud/stable9-ci-integration-tests
...
[stable9] Add integration tests
2016-06-15 16:17:03 +02:00
Jan-Christoph Borchardt
8ea06c8569
fix padding of 3-dot button on mobile
2016-06-15 15:54:30 +02:00
Marius Blüm
76eef55ff6
Merge pull request #108 from nextcloud/stable9-backport-97
...
[stable9] Change name of the product in update message
2016-06-15 13:26:57 +02:00
Morris Jobke
7d3bc95fa6
Merge pull request #88 from nextcloud/add-strict-cookie-check-also-to-config-js
...
[stable9] Add strict config check to config.js
2016-06-15 12:37:39 +02:00
Lukas Reschke
bdc6d21da5
Remove duplicate data folder
2016-06-15 12:31:01 +02:00
Morris Jobke
9fc6118247
add temporary cleanup step for CI
2016-06-15 12:30:56 +02:00
Morris Jobke
bd278c2081
fix integration tests for new admin_audit app
2016-06-15 12:30:50 +02:00
Morris Jobke
97ae4d8b00
Add integration tests
2016-06-15 12:30:45 +02:00
Morris Jobke
4e323a42ba
Change name of the product in update message
2016-06-15 12:25:35 +02:00
Lukas Reschke
7a5093c43e
Merge pull request #92 from nextcloud/stable9-fix-htaccess-warning
...
[stable9] Fix data directory warning
2016-06-14 13:39:55 +02:00
Lukas Reschke
6efe6b47ba
Fix data directory warning
...
Otherwise always the warning is displayed that the data directory is accessible from the internet when URLs without index.php are enabled.
Fixes https://github.com/nextcloud/server/issues/91
2016-06-14 13:29:38 +02:00
Lukas Reschke
326dcd7b66
9.0.50 it is
2016-06-14 12:28:40 +02:00
Lukas Reschke
d3374220f5
Merge pull request #75 from nextcloud/brand-to-nextcloud
...
Brand to nextcloud
2016-06-14 11:42:48 +02:00
Morris Jobke
b308b9521a
Merge pull request #87 from nextcloud/add-some-basic-cache-busting
...
[stable9] Add some basic cache busting
2016-06-14 10:57:38 +02:00
Morris Jobke
4a22f79ac3
Merge pull request #86 from nextcloud/adjust-release-string
...
Adjust release string
2016-06-14 10:55:50 +02:00
Lukas Reschke
6d559ff5cf
[stable9] Add strict config check to config.js
2016-06-14 09:18:33 +02:00
Lukas Reschke
3ead2b12ed
Add some super basic cache busting
...
At least the logo should be correct after an update.....
2016-06-14 09:10:52 +02:00
Lukas Reschke
ae1ed8c205
Adjust release string
2016-06-14 08:55:25 +02:00
Lukas Reschke
b63482bd97
Merge pull request #80 from nextcloud/dont-show-updater-if-updater-is-incompatible
...
[stable9] Don't show the updater if updater is incompatible
2016-06-14 08:51:38 +02:00
Morris Jobke
447ab7cd99
Merge pull request #84 from nextcloud/stable9-downstream-160613
...
[Stable9] downstream 16-06-13
2016-06-14 00:02:59 +02:00
Lukas Reschke
5e2bf16db1
[stable9] Don't show the updater if updater is incompatible
...
Prevents us from breaking instances.
2016-06-13 23:49:46 +02:00
Arthur Schiwon
a761fd65f0
Merge branch 'stable9' of https://github.com/owncloud/core into downstream-160613
2016-06-13 23:45:21 +02:00
Morris Jobke
a5a42e20f9
Merge pull request #82 from nextcloud/more-branding-yay
...
[stable9] Add more branding
2016-06-13 23:35:11 +02:00
Morris Jobke
ee72b3bf2d
Merge pull request #79 from nextcloud/stable9-this-is-nextcloud
...
[stable9] This is Nextcloud (CONTRIBUTING.md)
2016-06-13 23:32:54 +02:00
Lukas Reschke
b73972f3a1
Add more branding
...
- Shows "Nextcloud will be updated" in the updater screen
- Shows "Nextcloud" if you add a bookmark on iOS instead of "ownCloud"
2016-06-13 22:44:12 +02:00
Marius Blüm
a081923ffa
[stable9] This is Nextcloud (CONTRIBUTING.md)
2016-06-13 21:33:04 +02:00
Marius Blüm
757ca9593a
Merge pull request #78 from nextcloud/stable9-lgtm-noself
...
[stable9] LGTM: no self approval
2016-06-13 20:28:51 +02:00
Marius Blüm
5c9fa5ade7
[stable9] LGTM: no self approval
2016-06-13 20:19:57 +02:00
Lukas Reschke
9adc2bd5ef
Adjust url to Nc docs
2016-06-13 19:35:05 +02:00
Lukas Reschke
7e5b0ad249
Do not link to ownCloud Federation page
2016-06-13 19:33:27 +02:00
Lukas Reschke
5727a0dbe0
Remove translate link
...
We don't have any translation platform yet
2016-06-13 18:53:51 +02:00
Lukas Reschke
ea0e443b88
Merge pull request #72 from nextcloud/stable9-backport-33
...
[stable9] Add JS Unit tests
2016-06-13 18:20:48 +02:00
Morris Jobke
b6e102d3da
place password input directly below label
2016-06-13 16:39:24 +02:00
Morris Jobke
0cbfdf7d8b
revert suspicious change - please check this @schiessle & @LukasReschke
2016-06-13 16:30:20 +02:00
Morris Jobke
12df3eb71d
fix unit tests
2016-06-13 16:28:52 +02:00
Morris Jobke
74a93290aa
Use proper PhantomJS library and run the tests as separate step
...
* add dependency for phantomjs
2016-06-13 14:20:20 +02:00
Roeland Douma
d41d5c48f0
Show the path relative to the requesting user ( #25067 )
...
A share can only be requested by 3 'types' of people
* owner
* initiator
* recipient
So we have to get the path as the current user. Since that is the only
path that has any meaning to the user.
- Fixed tests
2016-06-13 12:47:21 +02:00
Roeland Douma
7863987b19
Repair job to fix permissions for avatars ( #25068 )
...
Backport of #24898
Cherry-picked:
1b66db72d9
60225284f3
28d9ad2817
But manually since we renamed stuff and the repair procedures changed
2016-06-13 12:47:02 +02:00
Lukas Reschke
577cf92009
Merge pull request #70 from nextcloud/show-spinner-again
...
[stable9] Show spinner for files_drop again
2016-06-13 10:25:51 +02:00