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

3592 commits

Author SHA1 Message Date
Jenkins for ownCloud
83d097c524 [tx-robot] updated from transifex 2014-11-29 01:54:28 -05:00
Jenkins for ownCloud
96b0328d39 [tx-robot] updated from transifex 2014-11-28 01:55:29 -05:00
Morris Jobke
4ed0a418a0 Merge pull request #12414 from owncloud/delay-autoconfig-kill-2 
autoconfig.php only to be deleted on successful installation
 2014-11-26 11:05:23 +01:00
Jenkins for ownCloud
3766d98df6 [tx-robot] updated from transifex 2014-11-26 01:54:31 -05:00
Thomas Müller
b68c07d687 autoconfig.php only to be deleted on successful installation 2014-11-25 11:14:35 +01:00
Thomas Müller
e956bd1094 Merge pull request #12359 from owncloud/fix-redirect-url-for-password-change 
Use `/` as redirect location if webroot is set to an empty value
 2014-11-24 11:09:17 +01:00
Vincent Petry
49ad10cfd0 Merge pull request #12362 from owncloud/add-ocs-header-per-default 
Add OCS API header per default
 2014-11-24 11:09:00 +01:00
Jenkins for ownCloud
0edcfc1dc1 [tx-robot] updated from transifex 2014-11-24 01:54:35 -05:00
Jenkins for ownCloud
fa3f7ad9e9 [tx-robot] updated from transifex 2014-11-22 01:55:21 -05:00
Lukas Reschke
8c2aeb9b21 Add OCS API header per default 
Relieve @PVince from having to write it all the time ;-)
 2014-11-21 19:54:19 +01:00
Lukas Reschke
0fa8b449b2 Use / as redirect location if webroot is set to an empty value 
If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all.

This means that while the password is getting resetted the user is not redirected to the login page.

I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff.

Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy)

Reported by @cdamken
 2014-11-21 15:38:36 +01:00
Jenkins for ownCloud
f8421958b3 [tx-robot] updated from transifex 2014-11-21 02:54:26 -05:00
Morris Jobke
985f8c3f69 Merge pull request #12330 from owncloud/jenkins-eat-that 
drop dependency of some commands on old config object
 2014-11-20 17:11:08 +01:00
Morris Jobke
8ae8eb4734 drop dependency of some commands on old config object 2014-11-20 15:03:16 +01:00
Volkan Gezer
995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Vincent Petry
10d0883da9 Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjs 
Added function to load translations from JS
 2014-11-20 10:53:46 +01:00
Jenkins for ownCloud
fffc5bc002 [tx-robot] updated from transifex 2014-11-20 01:55:06 -05:00
Vincent Petry
ffe57d89e4 Fix l10n promises 2014-11-19 17:02:17 +01:00
Vincent Petry
1c5933c96c Better use of promise in OC.L10N.load() 2014-11-19 14:49:15 +01:00
Lukas Reschke
1c8f9564a4 Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword 
Warn for password reset when files_encryption is enabled
 2014-11-19 13:05:02 +01:00
Vincent Petry
cd60a27ad6 Remove stray generateUrl 2014-11-19 10:59:38 +01:00
Jenkins for ownCloud
705976ba0a [tx-robot] updated from transifex 2014-11-19 01:54:59 -05:00
Vincent Petry
152da9796b Added function to load translations from JS 
For apps that support async translation loading, a new function
OC.L10N.load() can be used to asynchronously load the translations
for a given app.
 2014-11-18 12:20:01 +01:00
Morris Jobke
345eb62ffa center spinner 2014-11-18 10:25:16 +01:00
Lukas Reschke
9eeea57e3a Show spinner 2014-11-17 17:50:25 +01:00
Morris Jobke
68e77f4659 fix unreadable label in warning box 2014-11-17 17:50:20 +01:00
Lukas Reschke
f530865b3d Hide submit button after password change 
Creating a new key pair can take 1-2 seconds. So it could happen that the user click the "Reset password" button again which can lead to many nasty things, e.g. we could create two new key pairs in parallel.
 2014-11-17 17:50:20 +01:00
Bjoern Schiessle
11ab457b72 add password as parameter to the signal so that the encryption can create a new key-pair 2014-11-17 17:50:19 +01:00
Lukas Reschke
357465eac9 Add "postPasswordReset" hook 2014-11-17 17:50:19 +01:00
Lukas Reschke
767b08c669 Use correct route instead 
THX @schiesbn
(I should setup a mail server on my local system...)
 2014-11-17 17:50:19 +01:00
Lukas Reschke
57b5c82eb7 Remove uneeded import 2014-11-17 17:50:19 +01:00
Lukas Reschke
1b50d4f7ce Warn for password reset when files_encryption is enabled 
This patch wil warn the user of the consequences when resetting the password and requires checking a checkbox (as we had in the past) to reset a password.

Furthermore I updated the code to use our new classes and added some unit tests for it 👯

Fixes https://github.com/owncloud/core/issues/11438
 2014-11-17 17:50:19 +01:00
Jenkins for ownCloud
9df50c7be6 [tx-robot] updated from transifex 2014-11-17 01:54:33 -05:00
Jenkins for ownCloud
55889d7eb4 [tx-robot] updated from transifex 2014-11-16 01:55:00 -05:00
Jenkins for ownCloud
580d27eed2 [tx-robot] updated from transifex 2014-11-15 01:54:28 -05:00
Lukas Reschke
988c85d292 Refactor file sharing public link handling 
fixes download issue introduced by #10755

Conflicts:
	apps/files_sharing/public.php
 2014-11-14 16:26:59 +01:00
Morris Jobke
b564192ba2 Merge pull request #12158 from owncloud/drop-snapjs 
remove unneeded snap.js - followup to #11985 - ref #12156
 2014-11-13 16:03:11 +01:00
blizzz
559b34e53d Merge pull request #12005 from owncloud/bower-multiselect 
Move multiselect to user_ldap
 2014-11-13 14:43:06 +01:00
Morris Jobke
42793534d4 remove unneeded snap.js - followup to #11985 - ref #12156 2014-11-13 13:20:37 +01:00
Vincent Petry
5ca869c324 Merge pull request #9177 from owncloud/jsdocexperiment 
Improved JS Docs + added build script for JS Docs
 2014-11-13 11:16:08 +01:00
Morris Jobke
f39cb3fbc9 Migrate multiselect to user_ldap 2014-11-13 00:47:14 +01:00
Jenkins for ownCloud
1846fb0285 [tx-robot] updated from transifex 2014-11-12 01:55:24 -05:00
Jan-Christoph Borchardt
3ecb3f16bf Merge pull request #11929 from owncloud/fix-db-center 
fixes not centered database chooser on setup page
 2014-11-11 17:12:17 +01:00
Morris Jobke
8afb623f08 Merge pull request #12070 from owncloud/accessibility-fixes 
Accessibility fixes
 2014-11-10 13:06:46 +01:00
Jenkins for ownCloud
c3e3432662 [tx-robot] updated from transifex 2014-11-10 01:54:30 -05:00
Jenkins for ownCloud
46010655d2 [tx-robot] updated from transifex 2014-11-09 01:54:30 -05:00
Lukas Reschke
62882579e6 Merge pull request #12050 from owncloud/use-proper-array-name 
Use proper array key
 2014-11-08 15:46:21 +01:00
Lukas Reschke
b0f57d6ef8 Use proper array key 
Fixes https://github.com/owncloud/core/issues/12047
 2014-11-08 14:27:20 +01:00
Jenkins for ownCloud
da14a605d5 [tx-robot] updated from transifex 2014-11-08 01:54:35 -05:00
Jan-Christoph Borchardt
45a877c3a7 use proper tabindex order: 1. app menu, 2. search, 3. user menu 2014-11-08 01:47:46 +01:00