ae3425d2da
Merge branch 'master' into securityutils
...
Conflicts:
lib/private/util.php
2014-08-31 15:21:09 +02:00
73685892ed
Merge pull request #10770 from owncloud/getUserFolder
...
update public interface for getUserFolder
2014-08-31 13:26:32 +02:00
a197ef0f6c
Merge pull request #10768 from owncloud/l10n-use-public
...
Use public api for getting l10n
2014-08-31 11:58:59 +02:00
ac6324a5d0
update public interface for getUserFolder
2014-08-31 11:16:40 +02:00
ab5a389836
Merge pull request #10766 from owncloud/getUserFolder
...
Add optional user ID parameter for getUseFolder
2014-08-31 11:07:37 +02:00
a58e670ae5
Also extend public server interface
2014-08-31 10:20:00 +02:00
d0266c0bf8
Use public api for getting l10n
2014-08-31 10:08:22 +02:00
06e6f10ce4
Add optional user ID parameter for getUseFolder
2014-08-31 09:49:19 +02:00
23137f4798
[tx-robot] updated from transifex
2014-08-31 01:56:20 -04:00
a8dc4368c0
Merge pull request #10428 from owncloud/files_external_better_config
...
Improve external storage configuration UI
2014-08-30 15:11:39 +01:00
0e8a973579
Improve UI of external storage configuration
...
* Highlight fields that need to be filled
* Remove (required) and (optional) strings where possible
* Focus first configuration field when creating new external storage
* Add ability to force external storage re-check
* Various jQuery improvements
* Prevent wrapping of checkboxes in configuration
2014-08-30 09:02:37 +01:00
53f3b7ab52
[tx-robot] updated from transifex
2014-08-30 01:57:04 -04:00
0b88355368
Merge pull request #10721 from owncloud/kill-rand
...
Kill insecure random number generation
2014-08-29 19:48:00 +02:00
3a4b71ffb4
Merge pull request #10734 from owncloud/fix-10268
...
retrieve local users, groups and group members in a sorted way
2014-08-29 19:35:32 +02:00
9b1c4a1e74
Merge pull request #10738 from owncloud/fix-quotabar-width
...
Fix quota bar width, and indicate almost full storage
2014-08-29 18:31:06 +02:00
35276def1c
Merge pull request #10614 from owncloud/remove-ee-hack
...
Remove different URL for EE
2014-08-29 18:23:15 +02:00
0aede0f413
move hardcoded color to CSS class - for themeability
2014-08-29 17:50:59 +02:00
10382ef2f0
allow empty hostname and dots in service name for oracle autosetup
2014-08-29 17:09:17 +02:00
95382e9945
also add minimum width for quota bar so it’s apparent how it will look
2014-08-29 16:52:41 +02:00
41ace03911
color quota bar yellow for feedback if usage is over 90%
2014-08-29 16:46:08 +02:00
3ba66e33f8
set quota bar maximum to 100% to prevent overflow
2014-08-29 16:31:43 +02:00
3de69ff81b
Don't register the call when rendering error pages
2014-08-29 15:44:39 +02:00
dd7b8e4555
Remove insecure fallback random number generation
2014-08-29 15:44:09 +02:00
0bb460c9b5
retrieve local users, groups and group members in a sorted way
2014-08-29 15:17:37 +02:00
033b0361ed
Merge pull request #9214 from owncloud/wizard_email_detection
...
LDAP: Wizard email attribute detection
2014-08-29 12:58:51 +02:00
2764ceb14c
Merge pull request #9684 from owncloud/fix-9367
...
Ability to show/hide last log in and storage location in user management
2014-08-29 12:46:53 +02:00
9d67576540
Merge pull request #10724 from owncloud/min-size-for-icons
...
define min height/width for icon classes to make sure they show
2014-08-29 12:25:58 +02:00
7d1a0d4739
define min height/width for icon classes to make sure they show
2014-08-29 12:05:01 +02:00
2b63c375a4
Merge pull request #10719 from owncloud/files-external-personal-undefined
...
Prevent undefined index error loading external storages
2014-08-29 11:59:34 +02:00
67d9c7f7f7
Merge pull request #9681 from owncloud/kill_oc_session
...
kill OC::$session
2014-08-29 11:41:04 +02:00
1793e4e22b
Merge pull request #10701 from owncloud/tests-momentjsinclude
...
Include momentjs for unit tests
2014-08-29 11:40:19 +02:00
aa0ddf21b5
adjust static method vars as well
2014-08-29 11:14:36 +02:00
371cab367d
trigger email detection by Wizard upon any user filter filter change. before it happenend only upon user automatic list filter creation, but not on manual editing
2014-08-29 11:14:36 +02:00
6958033db9
undo falsely changed log file
2014-08-29 11:14:36 +02:00
34761dabb1
write log message, if original value was changed
2014-08-29 11:14:36 +02:00
f47a4a8c15
add unit test for mail detection
2014-08-29 11:14:35 +02:00
441c600c90
remove Access as hard dependency, inject it instead
2014-08-29 11:14:16 +02:00
baa49cd58a
Wizad: email attribute detection
2014-08-29 11:14:16 +02:00
f687794a4a
be correct in deprecation documentation
2014-08-29 10:22:21 +02:00
f551917a3c
kill OC::$session
...
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession
restore order os OC::$session and OC::$CLI
remove unneded initialization of dummy session
write back session when $useCustomSession is true
log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
ed2424c382
Merge pull request #10637 from owncloud/fixing-js-issues
...
Init vars with a value if none is provided
2014-08-29 10:16:29 +02:00
745ec12002
Merge pull request #10703 from owncloud/sometimes-allow-horizontal-scrollbar
...
allow horizontal scrollbar for personal and admin settings
2014-08-29 10:14:13 +02:00
bffccdbea7
Add missing 'personal' mount configuration option
2014-08-29 09:08:46 +01:00
8fdcbce200
Include momentjs for unit tests
2014-08-29 10:04:03 +02:00
359590d576
[tx-robot] updated from transifex
2014-08-29 01:56:59 -04:00
ba841d9561
user mgmt: move 'Show storage location' and 'Show last log in' to settings area
2014-08-29 00:08:01 +02:00
c7c54d9361
Adds 2 checkboxes at the top of userlist in the settings, to display/hide optional columns
...
This fixes #9367 .
2014-08-28 23:45:21 +02:00
ba0e65753b
Init vars with a value if none is provided
2014-08-28 13:53:45 -04:00
2080353048
allow horizontal scrollbar for personal and admin settings
2014-08-28 18:17:50 +02:00
54eb2f42df
Merge pull request #10647 from owncloud/implementing_momentjs
...
Implementing momentjs
2014-08-28 11:47:37 -04:00
Lukas Reschke
Morris Jobke
Robin Appelman
Jenkins for ownCloud
Robin McCorkell
jbtbnl
Jörn Friedrich Dreyer
Jan-Christoph Borchardt
Arthur Schiwon
Thomas Müller
Vincent Petry
Stephane V
Clark Tomlinson