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

35964 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
cbf943301f Merge pull request #2224 from nextcloud/fix-visibility-switcher 
Fix visibility switcher for avatar
 2016-11-24 15:47:55 +01:00
Lukas Reschke
ddf944eca1 Merge pull request #2302 from nextcloud/register-command-error-handling 
handle errors in apps while registering commands
 2016-11-24 15:47:20 +01:00
Lukas Reschke
d6ade509cf Merge pull request #2299 from nextcloud/oc-mounts-non-existing-user 
filter out oc_mounts results from non existing users
 2016-11-24 15:28:40 +01:00
Robin Appelman
65ace7c5a7
handle errors in apps while registering commands 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-24 15:13:29 +01:00
Morris Jobke
b74b6671c1 Merge pull request #2305 from nextcloud/fix_previews_federated_shares 
Fix previews for federated shares
 2016-11-24 14:37:12 +01:00
Morris Jobke
e3489d92fd Merge pull request #2303 from nextcloud/password-check-improvements 
small password check improvements
 2016-11-24 13:30:11 +01:00
Roeland Jago Douma
dab87ef6fd
Fix previews for federated shares 
The owner of a federated file is the federated user. For which we
obviously can't setup a view.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-24 13:20:51 +01:00
Bjoern Schiessle
9361952596
show dialog again of operation failed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-24 12:35:59 +01:00
Bjoern Schiessle
adb581431f
set focus on input field 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-24 12:35:28 +01:00
Robin Appelman
ce2f9493a7
filter out oc_mounts results from non existing users 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-24 11:44:18 +01:00
Lukas Reschke
f4cf125a4a Merge pull request #2296 from nextcloud/nitpicking-on-federation-admin-section 
Fix some language issues in the federation admin panel
 2016-11-24 10:13:57 +01:00
Roeland Jago Douma
dd1ab21887 Merge pull request #2290 from nextcloud/placeholder-typo-public-link-activity 
Fix placeholder typo in public link activity
 2016-11-24 09:34:35 +01:00
Joas Schilling
fbd574cc82
Fix some language issues in the federation admin panel 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-24 09:34:06 +01:00
Julius Härtl
25acce7e0d Merge pull request #2283 from nextcloud/no-padding-if-no-settings-area 
Remove padding from apps navigation if there is no settings area
 2016-11-23 21:52:13 +01:00
Joas Schilling
1c564fd554 Fix placeholder typo in public link activity 
https://www.transifex.com/nextcloud/nextcloud/translate/#152/files_sharing/101548786/
 2016-11-23 21:43:14 +01:00
Lukas Reschke
7d64d7ac8b Merge pull request #2233 from nextcloud/change-link-to-11 
Update link to the docs to 11
 2016-11-23 20:58:20 +01:00
Lukas Reschke
38658da12b Merge pull request #2286 from nextcloud/ldap_password_pr-1 
LDAP PR with tests
 2016-11-23 20:54:31 +01:00
Lukas Reschke
4c5e7d270a
Add tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-23 19:58:43 +01:00
Roeland Jago Douma
56c926bc8b Merge pull request #2247 from nextcloud/avatar-fallback 
use ? instead of X for avatar name fallback
 2016-11-23 19:27:59 +01:00
root
861c8572c0
restore ldap_password_pr 
Signed-off-by: Roger Szabo <roger.szabo@web.de>

remove notification part

Signed-off-by: Roger Szabo <roger.szabo@web.de>

blizzz comments

Signed-off-by: Roger Szabo <roger.szabo@web.de>

morris comment

Signed-off-by: Roger Szabo <roger.szabo@web.de>

improved error message for changing password

Signed-off-by: Roger Szabo <roger.szabo@web.de>

blizz comments 20161013

Signed-off-by: Roger Szabo <roger.szabo@web.de>

Signed-off-by: Roger Szabo <roger.szabo@web.de>

Adjust HintException usage

Signed-off-by: Roger Szabo <roger.szabo@web.de>

Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2016-11-23 19:02:48 +01:00
Morris Jobke
51b7d0490e
Remove padding from apps navigation if there is no settings area 
* fixes #2189

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-23 18:41:35 +01:00
Morris Jobke
d342eedc77 Merge pull request #2242 from nextcloud/fix-installation-spinner 
show installation spinner correctly, fix #2129
 2016-11-23 18:20:56 +01:00
Morris Jobke
34849f7bd3
fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-23 18:02:23 +01:00
Morris Jobke
59db9fada2 Merge pull request #2281 from nextcloud/fix-translation 
Fix language typo
 2016-11-23 17:53:21 +01:00
Lukas Reschke
5473475fa7 Merge pull request #2232 from nextcloud/imagescale-fix 
Workaround for PHP bug when calling imagescale
 2016-11-23 17:45:59 +01:00
Joas Schilling
14f01dbe33
Fix language typo 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-23 16:55:49 +01:00
Lukas Reschke
6d92550772 Merge pull request #2278 from nextcloud/filelist-share-visible 
make the share icon in the filelist visible again
 2016-11-23 16:40:10 +01:00
Lukas Reschke
e03512d4bc Merge pull request #2280 from nextcloud/do_not_escape_sharees 
Do not escape sharees
 2016-11-23 16:40:01 +01:00
Morris Jobke
6281607d7a
improved style of shared entry 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-23 15:25:48 +01:00
Roeland Jago Douma
9394713e72
Do not escape sharees 
Fixes #2253

Do not escape special characters else it will look very strange.
 2016-11-23 15:22:36 +01:00
Lukas Reschke
aa30c4cd80 Merge pull request #2240 from nextcloud/daita-encryption-init_on_master_key 
init Session/privateKeys on Master Key
 2016-11-23 15:19:24 +01:00
Morris Jobke
25f519c855 Merge pull request #2266 from nextcloud/avatar_image 
VCARDS don't hold binary data
 2016-11-23 14:49:32 +01:00
Robin Appelman
3bb3296c53
make the share icon in the filelist visible again 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-23 14:44:53 +01:00
Lukas Reschke
0adc688c84 Merge pull request #2275 from nextcloud/harden-cookies 
Harden cookies more appropriate
 2016-11-23 14:34:24 +01:00
Lukas Reschke
2eca9cc384 Merge pull request #2262 from nextcloud/specify-parameters-on-public-download 
Specify the parameters on public download
 2016-11-23 14:02:38 +01:00
Roeland Jago Douma
e9f98fd5a9
VCARDS don't hold binary data 
* We need to base64 encode the avatar!
* Switched to vcard v4
* User proper data uri

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-23 13:30:32 +01:00
Lukas Reschke
a05b8b7953
Harden cookies more appropriate 
This adds the __Host- prefix to the same-site cookies. This is a small but yet nice security hardening.

See https://googlechrome.github.io/samples/cookie-prefixes/ for the implications.

Fixes https://github.com/nextcloud/server/issues/1412

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-23 12:53:44 +01:00
Bjoern Schiessle
8a401ee156
check if session is initialized 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-23 12:20:43 +01:00
Lukas Reschke
f692ea34f1 Merge pull request #2263 from nextcloud/remove91_migration 
Remove migration steps in app dav
 2016-11-23 12:18:06 +01:00
Lukas Reschke
10cc849dbc Merge pull request #2267 from nextcloud/issue-2254-react-to-remote-share-activities-only 
Only do stuff when its a remote-share activity
 2016-11-23 12:16:55 +01:00
Joas Schilling
f0670aadbe Merge pull request #2239 from nextcloud/cleanup-settings-application-again 
Cleanup settings application again
 2016-11-23 11:07:10 +01:00
Joas Schilling
a36d26950e
Only do stuff when its a remote-share activity 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-22 22:46:18 +01:00
Joas Schilling
7b0b7e801f Merge pull request #2250 from nextcloud/check-if-data-is-defined 
Check if data is defined
 2016-11-22 20:31:32 +01:00
Thomas Müller
181af830fd
Remove 9.1 migration steps in app dav (#25654) 2016-11-22 20:17:05 +01:00
Joas Schilling
e9336dddd5
Specify the parameters on public download 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-22 20:14:42 +01:00
Morris Jobke
ca3b67703c Merge pull request #2251 from nextcloud/remove-superfluos-mail-input-field 
Remove superfluous email input field
 2016-11-22 19:21:22 +01:00
Lukas Reschke
623c02fe6e
Remove superfluous email input field 
That field is already there and looking at the code this seems to have been missed on a rebase.

Fixes https://github.com/nextcloud/server/issues/2222

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-22 18:29:09 +01:00
Lukas Reschke
f4470b6861 Merge pull request #2246 from nextcloud/display-name-for-files-and-tagging-activities-again 
Use the display name for files activities again
 2016-11-22 18:25:52 +01:00
Lukas Reschke
e827be759d
Check if data is defined 
Otherwise when adding a user as subadmin this would throw the following JS error:

```
users.js?v=bc2aae7…:500 Uncaught TypeError: Cannot read property 'message' of undefined(…)(anonymous function) @ users.js?v=bc2aae7…:500j @ jquery.js:3099fireWith @ jquery.js:3211x @ jquery.js:8264(anonymous function) @ jquery.js:8605
```

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-22 18:23:48 +01:00
Lukas Reschke
717fd9fdd6 Merge pull request #2229 from nextcloud/select2-fix-bis 
Select2 fix bis
 2016-11-22 17:50:53 +01:00