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

2170 commits

Author SHA1 Message Date
Morris Jobke
04e172c2ce add unit tests for new user create mail 2014-12-16 17:54:30 +01:00
Morris Jobke
3b61f76ca0 Send mail for new users 
* supply mail address
* send mail with username and URL to that mail address
* option to temporary enable this feature
 2014-12-16 09:10:22 +01:00
Jenkins for ownCloud
5b9c453071 [tx-robot] updated from transifex 2014-12-16 01:55:32 -05:00
Bernhard Posselt
be45366013 Merge pull request #12625 from owncloud/app-dependencies-libs-and-commands 
adding dependencies for command line tools and php libraries
 2014-12-15 12:34:46 +01:00
Jenkins for ownCloud
036456fe16 [tx-robot] updated from transifex 2014-12-15 01:54:30 -05:00
Jenkins for ownCloud
6ae0217326 [tx-robot] updated from transifex 2014-12-14 01:54:56 -05:00
Morris Jobke
efb495b09f Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-index 
Add filter for backend to rest index
 2014-12-13 08:50:15 +01:00
Morris Jobke
d3fe780805 fix initial loading limit of user management on large screens 2014-12-12 17:58:01 +01:00
Lukas Reschke
76a633bf52 Make comment clear 2014-12-12 16:50:14 +01:00
Lukas Reschke
dced436a3a Comment code path 2014-12-12 16:45:11 +01:00
Lukas Reschke
202f1215aa Use limit and offset 2014-12-12 16:43:24 +01:00
Lukas Reschke
d5b26e682c Use array key instead of value 2014-12-12 16:42:25 +01:00
Morris Jobke
04aaa72810 Show user backend in user management 
* add switch to settings to show user backend
* user classes for headers and rows to unify the show/hide statement
* add user backend to response of user create request
* proper markup in settings area
 2014-12-12 14:19:29 +01:00
Thomas Müller
dcb88e395b rework api of DependencyAnalyzer 2014-12-12 12:34:53 +01:00
Morris Jobke
c451d99daa Merge pull request #12790 from owncloud/user-mngt-js-only 
remove PHP generated user list and move all to the existing JS part
 2014-12-12 11:32:47 +01:00
Morris Jobke
3ab18f1f54 add comments to user list JS for better understanding 2014-12-12 09:59:42 +01:00
Morris Jobke
fa5790c8af move loading of JS and CSS to template 2014-12-12 09:22:15 +01:00
Morris Jobke
af1f34e813 remove PHP generated user list and move all to the existing JS part 2014-12-12 09:12:30 +01:00
Jenkins for ownCloud
68932b30fd [tx-robot] updated from transifex 2014-12-12 01:55:24 -05:00
Thomas Müller
95fc5addec adjust styling of missing dependencies in apps management 2014-12-11 15:24:36 +01:00
Lukas Reschke
661dc789ce Break loop 2014-12-11 12:29:53 +01:00
Jenkins for ownCloud
dc506dcfbf [tx-robot] updated from transifex 2014-12-11 01:55:27 -05:00
Lukas Reschke
269ae49c1c Merge pull request #12611 from owncloud/use-uid-instead-of-loginname 
Use UID instead of login name
 2014-12-10 12:26:22 +01:00
Lukas Reschke
5dc6406b70 Add filter for 'backend' to user REST route 
This adds a "backend" type filter to the index REST route which is a pre-requisite for https://github.com/owncloud/core/issues/12620

For example when calling `index.php/settings/users/users?offset=0&limit=10&gid=&pattern=&backend=OC_User_Database` only users within the backend `OC_User_Database` would be shown. (requires sending a CSRF token as well)

Depends upon https://github.com/owncloud/core/pull/12711
 2014-12-10 12:07:34 +01:00
Lukas Reschke
5398bbdc00 Merge pull request #12711 from owncloud/add-backend-to-rest-index 
Expose backend type via REST API
 2014-12-10 11:56:45 +01:00
Jenkins for ownCloud
ea95bb0189 [tx-robot] updated from transifex 2014-12-10 01:55:34 -05:00
Morris Jobke
bfcd5a3802 Merge pull request #11214 from owncloud/issue/10836 
Add an option to disallow sending sharing emails to non-owncloud users
 2014-12-09 14:05:52 +01:00
Lukas Reschke
4c13918bd8 Expose backend type via REST API 
This change will expose the user backend via the REST API which is a pre-requisite for https://github.com/owncloud/core/issues/12620.

For example:
````json
[{"name":"9707A09E-CA9A-4ABE-A66A-3F632F16C409","displayname":"Document Conversion User Account","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/9707A09E-CA9A-4ABE-A66A-3F632F16C409","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"ED86733E-745C-4E4D-90CB-278A9737DB3C","displayname":"Hacker","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/ED86733E-745C-4E4D-90CB-278A9737DB3C","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"71CDF45B-E125-450D-983C-D9192F36EC88","displayname":"admin","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/71CDF45B-E125-450D-983C-D9192F36EC88","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"admin","displayname":"admin","groups":["admin"],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/admin","lastLogin":"1418057287","backend":"OC_User_Database"},{"name":"test","displayname":"test","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/test","lastLogin":0,"backend":"OC_User_Database"}]
```
 2014-12-09 12:04:19 +01:00
Joas Schilling
539c0aeb04 Add an option to disallow sending sharing emails to non-owncloud users 
Fix #10836
 2014-12-09 11:32:39 +01:00
Joas Schilling
78a307995c Fix namespace of Files_Encryption outside of the app 2014-12-09 09:47:26 +01:00
Thomas Müller
c36bac3abd Merge pull request #12406 from owncloud/drop-getApps-getUsers 
Config cleanup - OC_Preferences refactoring
 2014-12-09 09:36:38 +01:00
Jenkins for ownCloud
8f8f9deb66 [tx-robot] updated from transifex 2014-12-09 01:56:38 -05:00
Morris Jobke
0d4f0ab871 reduce OC_Preferences, OC_Config and \OCP\Config usage 
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
 2014-12-08 22:42:37 +01:00
Lukas Reschke
f219f5a7a6 Merge pull request #12618 from owncloud/initial-work-migrate-to-appframework 
Add REST route for managing groups and users
 2014-12-08 21:37:41 +01:00
Lukas Reschke
c23957811d React on other statuscodes than 200 2014-12-08 16:35:13 +01:00
Lukas Reschke
5f43809ace Merge branch 'initial-work-migrate-to-appframework' of https://github.com/owncloud/core into initial-work-migrate-to-appframework 2014-12-08 15:34:17 +01:00
Lukas Reschke
8b3e389062 Add statuscodes 2014-12-08 15:32:59 +01:00
Lukas Reschke
3a49411051 Fix url 2014-12-08 15:32:53 +01:00
Morris Jobke
eac0131d5a fix updated URL schema in JS unit tests 2014-12-08 15:05:03 +01:00
Lukas Reschke
fe7d9a7ca0 Add REST route for user & group management 
First step of a somewhat testable user management. - I know, the JSON returns are in an ugly format but the JS expects it that way. So let's keep it that way until we have time to fix the JS in the future.
 2014-12-08 12:11:01 +01:00
Lukas Reschke
8b9cc5c25b Remove unexisting htAccessWorkinght 
Partially fixes https://github.com/owncloud/core/issues/12690 - remark to myself: improve grep skills.
 2014-12-08 11:25:32 +01:00
Morris Jobke
e6908f8b89 Merge pull request #12657 from owncloud/ajaxify-htaccess-check 
Check for working .htaccess via AJAX
 2014-12-08 10:37:06 +01:00
Jenkins for ownCloud
2784d580bd [tx-robot] updated from transifex 2014-12-08 01:54:57 -05:00
Jenkins for ownCloud
8ee9ee29ea [tx-robot] updated from transifex 2014-12-07 01:54:32 -05:00
Lukas Reschke
2b76227180 Check for working .htaccess via AJAX 
Fixes https://github.com/owncloud/core/issues/12650
 2014-12-06 15:34:53 +01:00
Jenkins for ownCloud
94eb2e782f [tx-robot] updated from transifex 2014-12-06 01:54:56 -05:00
Raghu Nayyar
bfb519cced Merge pull request #12636 from owncloud/fix-ie9-placeholder 
fix placeholder fake in IE8 & 9 that brokes group listing in user manage...
 2014-12-06 11:54:31 +05:30
Morris Jobke
23e09be65f fix placeholder fake in IE8 & 9 that brokes group listing in user management - fixes #12525 2014-12-05 12:16:22 +01:00
Jenkins for ownCloud
4d53f163fd [tx-robot] updated from transifex 2014-12-05 01:55:52 -05:00
Clark Tomlinson
b8a2fdaa21 Merge pull request #12607 from owncloud/this-is-an-awesome-day 
PHP 5.4 is now required for master
 2014-12-04 10:33:04 -05:00
Lukas Reschke
d712c27fe1 Use UID instead of login name 
Login name can be something different and thus I'm pretty sure this will break in combination with external auth providers such as LDAP.
 2014-12-04 12:03:14 +01:00
Thomas Müller
ba52c996cf adding supported databases 2014-12-04 11:40:33 +01:00
Thomas Müller
d235a9c128 display missing dependencies in the apps management page 2014-12-04 11:40:33 +01:00
Thomas Müller
b469e9f6fb introduce dependency analyzer to take care of app dependencies 
some more unit tests on xml info parser
 2014-12-04 11:40:33 +01:00
Lukas Reschke
1b0bc2e099 PHP 5.4 is now required for master 
🍻
 2014-12-04 10:46:38 +01:00
Jenkins for ownCloud
5aad902507 [tx-robot] updated from transifex 2014-12-04 01:54:42 -05:00
Thomas Müller
e91dddd1a0 Merge pull request #12552 from szlwzl/master 
adding @ sign between email address and domain name to make syntax clearer
 2014-12-03 16:02:35 +01:00
Jenkins for ownCloud
af50df8912 [tx-robot] updated from transifex 2014-12-03 01:54:32 -05:00
Simon Whittaker
6d04ca18d9 adding @ sign between email address and domain name to make the syntax clearer 2014-12-02 15:06:40 +00:00
Thomas Müller
0769556989 Merge pull request #12419 from owncloud/read-only-config 
Allow read-only configuration
 2014-12-01 16:37:29 +01:00
Jenkins for ownCloud
5275daff4e [tx-robot] updated from transifex 2014-12-01 01:54:26 -05:00
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
Jenkins for ownCloud
87a2aabb98 [tx-robot] updated from transifex 2014-11-27 01:54:46 -05:00
Jenkins for ownCloud
3766d98df6 [tx-robot] updated from transifex 2014-11-26 01:54:31 -05:00
Lukas Reschke
fc116f563f Allow read-only configuration 
Workaround required for IIS setups running ownCloud to prevent dataloss.

Long-term solution would be to move some configuration settings to the database
 2014-11-25 16:26:47 +01:00
Morris Jobke
168fce0b18 Merge pull request #12303 from owncloud/windows-unknown-command-command 
Deduplicate findBinaryPath() and do not try "command -v" on windows
 2014-11-24 14:03:07 +01:00
Jenkins for ownCloud
0edcfc1dc1 [tx-robot] updated from transifex 2014-11-24 01:54:35 -05:00
Jenkins for ownCloud
a3496cf7fa [tx-robot] updated from transifex 2014-11-23 01:54:39 -05:00
Jenkins for ownCloud
fa3f7ad9e9 [tx-robot] updated from transifex 2014-11-22 01:55:21 -05:00
Jenkins for ownCloud
f8421958b3 [tx-robot] updated from transifex 2014-11-21 02:54:26 -05:00
Volkan Gezer
388ef07c20 update grammar 
Suggested by mnestis on Transifex.
 2014-11-21 02:17:02 +01:00
Volkan Gezer
995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Joas Schilling
64421d76fd Deduplicate function by moving it to the OC_Helper 2014-11-20 12:37:59 +01:00
Jenkins for ownCloud
fffc5bc002 [tx-robot] updated from transifex 2014-11-20 01:55:06 -05:00
Joas Schilling
e32968cfce Remove exec() call with invalid name on windows 
Currently running unit tests prints the following message 3 times:
The command "command" is misspelt or could not be found.
Instead of trying this, we just skip this now.
 2014-11-19 17:04:55 +01:00
Jenkins for ownCloud
705976ba0a [tx-robot] updated from transifex 2014-11-19 01:54:59 -05:00
Morris Jobke
256eff6eac User management search just searches users - adjust label of input field - fixes #10229 2014-11-18 22:12:14 +01:00
Jenkins for ownCloud
9df50c7be6 [tx-robot] updated from transifex 2014-11-17 01:54:33 -05:00
Jenkins for ownCloud
580d27eed2 [tx-robot] updated from transifex 2014-11-15 01:54:28 -05:00
Jenkins for ownCloud
0811b39e5f [tx-robot] updated from transifex 2014-11-14 01:54:47 -05:00
Jenkins for ownCloud
a069171cda [tx-robot] updated from transifex 2014-11-13 01:54:36 -05:00
Thomas Müller
5aaea6961c Merge pull request #12110 from owncloud/fix-12080 
add 'namespace' for automatically created navigation divs, fixes #12080
 2014-11-12 11:25:42 +01:00
Arthur Schiwon
c5c74792d1 add 'namespace' for automatically created navigation divs, fixes #12080 2014-11-12 10:42:44 +01:00
Jenkins for ownCloud
1846fb0285 [tx-robot] updated from transifex 2014-11-12 01:55:24 -05:00
Thomas Müller
4c1244f50c Merge pull request #11917 from owncloud/fix-11909 
Add checkbox to enforce SSL for subdomains
 2014-11-11 20:37:50 +01:00
Jenkins for ownCloud
664cc4ac0e [tx-robot] updated from transifex 2014-11-11 01:55:23 -05:00
Morris Jobke
311566b96d Login Name -> Username in user management 2014-11-10 10:52:47 +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
230fb75a4f Merge pull request #12038 from sebomoto/fix-user-dropdown 
changed default dropdown content
 2014-11-08 14:46:57 +01:00
Jenkins for ownCloud
da14a605d5 [tx-robot] updated from transifex 2014-11-08 01:54:35 -05:00
Sebastian Bolt
cc19d05ae7 changed default dropdown content 
to fix issue #11959
 2014-11-07 21:56:48 +01:00
Jenkins for ownCloud
7d47d50724 [tx-robot] updated from transifex 2014-11-07 01:55:10 -05:00
Morris Jobke
7353183d99 bower strengthify 2014-11-06 16:29:34 +01:00
Morris Jobke
f816f3df03 bower zxcvbn 2014-11-06 11:55:57 +01:00
Morris Jobke
49fbd766c2 bower jcrop 2014-11-06 09:32:34 +01:00
Morris Jobke
226d43a1cf manage select2 via bower 2014-11-06 09:27:12 +01:00
Jenkins for ownCloud
fa4018d36c [tx-robot] updated from transifex 2014-11-06 01:55:04 -05:00
Morris Jobke
0af5a8db74 drop unused library chosen 2014-11-05 22:41:33 +01:00
Morris Jobke
02c7fb8445 bower handlebars 2014-11-05 16:47:46 +01:00
Morris Jobke
a857bf1d50 drop jquery.inview as it is unused 2014-11-05 12:57:18 +01:00
Jenkins for ownCloud
c8f55e7f87 [tx-robot] updated from transifex 2014-11-05 01:54:36 -05:00
Jenkins for ownCloud
287faf9923 [tx-robot] updated from transifex 2014-11-04 01:55:05 -05:00
Lukas Reschke
e73ccbd4ca Migrate "setsecurity.php" to the AppFramework 
Add switch to enforce SSL for subdomains

Add unit tests

Add test for boolean values

Camel-case

Fix ugly JS
 2014-11-03 16:53:03 +01:00
Vincent Petry
2a454fd04d Capitalize Checks in admin page 2014-11-03 15:41:40 +01:00
Jenkins for ownCloud
fd480d6c40 [tx-robot] updated from transifex 2014-11-02 01:54:24 -05:00
Jenkins for ownCloud
469b2655d5 [tx-robot] updated from transifex 2014-11-02 01:54:29 -04:00
Jenkins for ownCloud
d8f7780f4f [tx-robot] updated from transifex 2014-11-01 01:54:37 -04:00
Jenkins for ownCloud
e00f25e5b0 [tx-robot] updated from transifex 2014-10-31 01:55:39 -04:00
Thomas Müller
1076a77840 fix loading of more log entries 2014-10-30 14:59:13 +01:00
Thomas Müller
d9db791c67 introduce sidebar for admin page 2014-10-30 13:44:40 +01:00
Jenkins for ownCloud
ea55848fa1 [tx-robot] updated from transifex 2014-10-30 01:55:14 -04:00
Thomas Müller
ff84384513 Adding translations for settings 2014-10-29 10:57:46 +01:00
Thomas Müller
9f7c571e40 update all translation files to js and json 2014-10-29 10:13:50 +01:00
Jenkins for ownCloud
cb944814d9 [tx-robot] updated from transifex 2014-10-29 01:54:45 -04:00
Lukas Reschke
437a660680 Merge pull request #11600 from owncloud/refactor-appsettings-to-app-framework 
Migrate new app settings to AppFramework
 2014-10-28 11:13:20 +01:00
Jenkins for ownCloud
23873d80fe [tx-robot] updated from transifex 2014-10-28 01:55:38 -04:00
Jenkins for ownCloud
5d391910c5 [tx-robot] updated from transifex 2014-10-27 01:54:28 -04:00
Jenkins for ownCloud
214af9523a [tx-robot] updated from transifex 2014-10-26 01:54:32 -04:00
Jenkins for ownCloud
3652f02e48 [tx-robot] updated from transifex 2014-10-25 01:54:35 -04:00
Lukas Reschke
2d2a4741ce Make files non executable 
There is not much sense in having these files marked executable, we should avoid that.
 2014-10-24 11:14:51 +02:00
Jenkins for ownCloud
9babcfb9e2 [tx-robot] updated from transifex 2014-10-24 01:55:11 -04:00
Jan-Christoph Borchardt
7e266e8a79 Merge pull request #11720 from sebomoto/groupadmin-header 
"Group admin" default label (issue #7706)
 2014-10-23 12:04:33 +02:00
Jenkins for ownCloud
e75c2edba6 [tx-robot] updated from transifex 2014-10-23 01:55:51 -04:00
Sebastian Bolt
52684c86e5 "Group admin" default label (issue #7706) 
Changed the column header to "Group Admin for" and the default value of
the multiselect box to "no group" if user is not a groupadmin for any
group.
 2014-10-22 22:08:55 +02:00
Lukas Reschke
37043508a4 Merge pull request #11620 from owncloud/settings-sidebar 
Settings sidebar
 2014-10-22 17:49:51 +02:00
Jenkins for ownCloud
916e710ece [tx-robot] updated from transifex 2014-10-22 01:55:22 -04:00
Jenkins for ownCloud
8485743e33 [tx-robot] updated from transifex 2014-10-21 01:55:45 -04:00
Jenkins for ownCloud
87da62072b [tx-robot] updated from transifex 2014-10-20 01:54:34 -04:00
Jenkins for ownCloud
245ae7e071 [tx-robot] updated from transifex 2014-10-19 01:54:36 -04:00
Jenkins for ownCloud
68dd1edbfe [tx-robot] updated from transifex 2014-10-18 01:55:30 -04:00
Lukas Reschke
479424a459 Add some basic sanitization 
Better to be safe than sorry ;)
 2014-10-17 10:39:35 +02:00
Thomas Müller
04323fbc19 implement sidebar fro personal settings - bad kung-fu 2014-10-17 10:38:13 +02:00
Jan-Christoph Borchardt
4611520c7f first steps of sidebar for personal and admin settings 2014-10-17 10:38:13 +02:00
Jenkins for ownCloud
92f2914335 [tx-robot] updated from transifex 2014-10-17 01:58:25 -04:00
Thomas Müller
4f2422ffbe fixing typo in English source string 2014-10-16 15:24:28 +02:00
Jenkins for ownCloud
c8d8578d1a [tx-robot] updated from transifex 2014-10-16 01:56:30 -04:00
Lukas Reschke
e4227658d9 Migrate new app settings to AppFramework 
Let's migrate those two new files.
 2014-10-15 22:01:56 +02:00
Lukas Reschke
f48c973876 Merge pull request #11570 from owncloud/backport-11408-master 
Backport 11408 master
 2014-10-15 21:21:45 +02:00
Thomas Müller
b091394a90 introduce new app page layout 
filter installed and not-installed apps properly

kill unneeded file

load category 'Installed' on page load

adding documentation links

new apps mgmt: first style adjustment

apps mgmt: only show license and preview if they exist

adding buttons

new apps mgmt: fix for mobile

use app icon if available

new apps mgmt: position enable/disable toggle to the right

new apps mgmt: proper display of icons or previews

new apps mgmt: fix loading spinner

reenable group selection for apps

new apps mgmt: position enable button normally again

new apps mgmt: clarify wording from 'Installed' to 'Enabled'

reintroduce enable/disable

Move rating image path generation to client-side

Move expression outside of l10n

fix group handling

add buttons for 'More apps' and 'Add your app' again

disable changed date of app for now

adding recommended label

style 'Recommended' app tag

fixing php warning

sort by rating

adding meta-category 'Recommended'

 Only show existing documentation links

lacy loading of screenshots

making group based app activation work again

adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'

adding app.svg for all core apps

query string '?installed' is not longer needed

update and uninstall is back + error feedback

remove unneeded parameter

fix alignment of 'recommended' label
 2014-10-15 15:21:40 +02:00
Thomas Müller
d3eebad591 fixing typos 2014-10-14 15:38:39 +02:00
Lukas Reschke
13b1b45ee4 Refactor MailSettings controller 
- Do not store the password (fixes https://github.com/owncloud/core/issues/11385)
- Refactor to AppFramework
- Add unit tests

Conflicts:
	settings/admin/controller.php
 2014-10-14 15:38:34 +02:00
Jenkins for ownCloud
526abf1ad6 [tx-robot] updated from transifex 2014-10-14 01:54:28 -04:00
Thomas Müller
baffe5353f Merge pull request #11543 from owncloud/closeSessionForAppsLoading 
Close session when loading apps
 2014-10-13 17:59:12 +02:00
Lukas Reschke
50841f8307 Close session when loading apps 
Otherwise the session is blocked while all remote apps are loaded. This can be very annoying especially when apps.owncloud.com is down or not reachable.
 2014-10-13 15:03:44 +02:00
Jenkins for ownCloud
4b9465b937 [tx-robot] updated from transifex 2014-10-13 01:54:35 -04:00
Jenkins for ownCloud
a3635fedbb [tx-robot] updated from transifex 2014-10-12 01:54:39 -04:00
Jenkins for ownCloud
a0db01ecd3 [tx-robot] updated from transifex 2014-10-11 01:55:02 -04:00
Jenkins for ownCloud
2cc26c9022 [tx-robot] updated from transifex 2014-10-10 01:55:10 -04:00