Commit Graph

20084 Commits

Author SHA1 Message Date
Clark Tomlinson 6a56e03d48 Using countUsers method to return true count of users 2014-09-05 11:23:59 -04:00
Morris Jobke 033b0361ed Merge pull request #9214 from owncloud/wizard_email_detection
LDAP: Wizard email attribute detection
2014-08-29 12:58:51 +02:00
Morris Jobke 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
Morris Jobke 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
Jan-Christoph Borchardt 7d1a0d4739 define min height/width for icon classes to make sure they show 2014-08-29 12:05:01 +02:00
Thomas Müller 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
Lukas Reschke 67d9c7f7f7 Merge pull request #9681 from owncloud/kill_oc_session
kill OC::$session
2014-08-29 11:41:04 +02:00
Thomas Müller 1793e4e22b Merge pull request #10701 from owncloud/tests-momentjsinclude
Include momentjs for unit tests
2014-08-29 11:40:19 +02:00
Arthur Schiwon aa0ddf21b5 adjust static method vars as well 2014-08-29 11:14:36 +02:00
Arthur Schiwon 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
Arthur Schiwon 6958033db9 undo falsely changed log file 2014-08-29 11:14:36 +02:00
Arthur Schiwon 34761dabb1 write log message, if original value was changed 2014-08-29 11:14:36 +02:00
Arthur Schiwon f47a4a8c15 add unit test for mail detection 2014-08-29 11:14:35 +02:00
Arthur Schiwon 441c600c90 remove Access as hard dependency, inject it instead 2014-08-29 11:14:16 +02:00
Arthur Schiwon baa49cd58a Wizad: email attribute detection 2014-08-29 11:14:16 +02:00
Jörn Friedrich Dreyer f687794a4a be correct in deprecation documentation 2014-08-29 10:22:21 +02:00
Jörn Friedrich Dreyer 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
Thomas Müller 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
Thomas Müller 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
Robin McCorkell bffccdbea7 Add missing 'personal' mount configuration option 2014-08-29 09:08:46 +01:00
Vincent Petry 8fdcbce200 Include momentjs for unit tests 2014-08-29 10:04:03 +02:00
Jenkins for ownCloud 359590d576 [tx-robot] updated from transifex 2014-08-29 01:56:59 -04:00
Jan-Christoph Borchardt ba841d9561 user mgmt: move 'Show storage location' and 'Show last log in' to settings area 2014-08-29 00:08:01 +02:00
Stephane V 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
Clark Tomlinson ba0e65753b Init vars with a value if none is provided 2014-08-28 13:53:45 -04:00
Jan-Christoph Borchardt 2080353048 allow horizontal scrollbar for personal and admin settings 2014-08-28 18:17:50 +02:00
Clark Tomlinson 54eb2f42df Merge pull request #10647 from owncloud/implementing_momentjs
Implementing momentjs
2014-08-28 11:47:37 -04:00
Vincent Petry f4e6cd5f3e Merge pull request #10658 from owncloud/sftp_prevent_error
Prevent errors on broken SFTP config
2014-08-28 17:09:36 +02:00
Bernhard Posselt 31bb85654e Merge pull request #10696 from owncloud/inputdate
Enhancement: Adds input styles to input type dates too.
2014-08-28 16:55:51 +02:00
raghunayyar 3ee3557d4c Enhancement: Adds input styles to input type dates too. 2014-08-28 16:53:19 +02:00
Clark Tomlinson 92685acf60 Implementing moment.js
Updating Usages

Removing unused method

Adding JS Doc
2014-08-28 09:28:45 -04:00
blizzz 6fa609325c Merge pull request #8507 from owncloud/ajaxify_user_list_for_files_external
Ajaxify user list for files external
2014-08-28 13:39:21 +02:00
Arthur Schiwon 1c0cc6c7bc fix wizard test, adjust to changed parameters of the tested method, introduced by 9caa354cfc 2014-08-28 11:53:40 +02:00
Arthur Schiwon dbd51d15e1 Port of #8623
set result entry identifier earlier, i.e. before a continue for the same level can happen. otherwise  will always get the same value and we end up in an infinite loop

add unit test to make sure the infinite loop never comes back

Conflicts:
	apps/user_ldap/tests/wizard.php
2014-08-28 11:52:33 +02:00
Lukas Reschke 2f76117cb8 Merge pull request #10670 from owncloud/encodeExceptions
Escape error messages
2014-08-28 09:36:18 +02:00
Jenkins for ownCloud 1b342a70d6 [tx-robot] updated from transifex 2014-08-28 01:56:36 -04:00
Lukas Reschke 9ab62ad5b7 Escape error messages 2014-08-27 17:01:51 +02:00
Clark Tomlinson cb0da1178b Merge pull request #10653 from owncloud/x-forwarded-for
Add support for getting the real client IP behind proxies
2014-08-27 10:32:34 -04:00
Lukas Reschke 13012fb5f7 Merge pull request #10666 from ogasser/appframework_db_tests
Make Entity properties ```protected``` as in docs
2014-08-27 15:28:22 +02:00
Oliver Gasser 47a2e31c93 Make Entity properties ```protected``` as in docs
Entity properties are marked as ```protected``` to correctly reflect the
documentation.

See also owncloud/documentation@644f2eedac
2014-08-27 13:31:51 +02:00
Björn Schießle c35d60f6d8 Merge pull request #9915 from suraia/unsharefromself-source
Allow specifying the item source in unshareFromSelf().
2014-08-27 10:31:35 +02:00
Robin McCorkell 87167d3141 Prevent errors on broken SFTP config 2014-08-27 09:02:14 +01:00
Jenkins for ownCloud 2740908a5b [tx-robot] updated from transifex 2014-08-27 01:54:40 -04:00
Lukas Reschke 7acdd018a1 Add support for getting the real client IP behind proxies
Fixes https://github.com/owncloud/core/issues/10624

Fix copy paste fail

Add unittest for comma separated headers

Revert 3rdparty
2014-08-27 00:05:04 +02:00
Lukas Reschke 35b035c374 Merge pull request #10641 from callahad/email-input-type
Set email input field to type=email for better UX
2014-08-26 22:09:50 +02:00
Clark Tomlinson c0bc41ff1e Merge pull request #10640 from owncloud/add_moment_js
add moment.js
2014-08-26 13:32:47 -04:00
Dan Callahan 6cca20fb36 Set email input field to type=email for better UX 2014-08-26 11:14:30 -05:00
Georg Ehrke f82b788ba5 add moment.js 2014-08-26 17:39:15 +02:00
Thomas Müller 3115053bbb Merge pull request #10604 from owncloud/fixing-favicon
Adding type to favicon
2014-08-26 17:35:50 +02:00
Thomas Müller 910b827b98 Merge pull request #9844 from OliverKohlDSc/patch-1
CRON call ends in null exception
2014-08-26 14:42:07 +02:00