sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,172 Commits
622 Branches
1167 Tags
9.0 GiB
Commit Graph

709 Commits (17f94de19b5a22c791d4d099ab3a7ad11b254445)

Author SHA1 Message Date
Robin Appelman a224d80f4d Sort internal apps above 3rdparty apps 2013-01-31 17:49:58 +07:00
Lukas Reschke b471177439 Merge pull request #1379 from owncloud/improved_appsmanagement 
Improved appsmanagement
 2013-01-31 08:30:55 +07:00
Thomas Müller 0dd9e6cb12 Merge pull request #1387 from schiesbn/visual_improvements 
small visual improvements
 2013-01-31 08:30:25 +07:00
Jenkins for ownCloud 209d599ec5 [tx-robot] updated from transifex 2013-01-31 17:05:21 +07:00
Thomas Mueller 85a12970c7 update on translation string 2013-01-31 14:11:31 +07:00
Thomas Mueller 3af09f2acf l10n support for the error dialog added 2013-01-31 10:43:59 +07:00
Thomas Mueller 8a662a6c74 Cleanup string - easier for translators 2013-01-31 10:34:54 +07:00
Björn Schießle 170cf20298 addapt the css to adjust the change display name filed to the set password field 2013-01-31 09:57:16 +07:00
Jenkins for ownCloud 00a30e6651 [tx-robot] updated from transifex 2013-01-31 00:31:28 +07:00
Björn Schießle 92921ceefd make strings translatable 2013-01-30 16:28:41 +07:00
Frank Karlitschek ea5861ed8c remove leftover code 2013-01-30 15:27:20 +07:00
Frank Karlitschek 5e422dea61 fix typo 2013-01-30 14:52:35 +07:00
Frank Karlitschek 66cab77b6d merge master 
Merge branch 'master' into improved_appsmanagement

Conflicts:
	settings/apps.php
	settings/templates/apps.php
 2013-01-30 14:36:17 +07:00
Frank Karlitschek 389c4e8415 mark recommended apps. server part not yet fully implemented 2013-01-30 13:39:53 +07:00
Jenkins for ownCloud 68266e70f2 [tx-robot] updated from transifex 2013-01-30 00:25:41 +07:00
Lukas Reschke 250c565d2b Merge pull request #1360 from owncloud/display_name 
introduction of display names
 2013-01-29 14:05:54 +07:00
Björn Schießle 6659798197 only change display name if the display name from the current user was changed; add correct display name to new user 2013-01-29 22:33:46 +07:00
Björn Schießle 56c6e6a334 remove debug output 2013-01-29 22:20:47 +07:00
Björn Schießle afad6e95db check permissions before changing the display name 2013-01-29 22:20:15 +07:00
Björn Schießle 27edbfdf56 added missing changedisplayname.php 2013-01-29 21:52:03 +07:00
Björn Schießle e613a68274 remove dubug output 2013-01-29 21:30:04 +07:00
Björn Schießle 8d0b67e17a fix typo in variable name 2013-01-29 21:04:11 +07:00
Björn Schießle 4b7b092008 rename Name to Login Name 2013-01-28 17:05:20 +07:00
Björn Schießle f3a99f4869 show display name in input field 2013-01-28 17:01:37 +07:00
Björn Schießle e0f2ed2757 interface and API to change display names 2013-01-28 14:09:11 +07:00
Björn Schießle 022a7b13b8 prepare user table to show and edit display names 2013-01-28 13:12:44 +07:00
Jenkins for ownCloud b655444709 [tx-robot] updated from transifex 2013-01-28 00:05:43 +07:00
Jenkins for ownCloud 00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +07:00
Thomas Müller 276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master 
Fixing 998 master
 2013-01-26 04:15:40 +07:00
Jenkins for ownCloud af4411e33d [tx-robot] updated from transifex 2013-01-26 00:10:07 +07:00
Björn Schießle 19024de988 typo fixed 2013-01-25 17:44:40 +07:00
Lukas Reschke 047f1988c3 Merge branch 'master' into no-inline-js 2013-01-25 16:11:07 +07:00
Björn Schießle 64e853394c compare the correct uids 2013-01-25 12:46:32 +07:00
Björn Schießle 4271430e60 get all display names from users in a given group 2013-01-25 11:48:03 +07:00
Björn Schießle 9bb8e05839 get all display names 2013-01-25 11:05:00 +07:00
Jenkins for ownCloud 6832dddf39 [tx-robot] updated from transifex 2013-01-25 00:05:56 +07:00
Lukas Reschke c8bbbb48d3 Merge master... 2013-01-23 11:30:40 +07:00
Lukas Reschke 48949ba04a Move appid to external file 2013-01-23 11:21:34 +07:00
Jenkins for ownCloud c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +07:00
Lukas Reschke 8907bdaf7f Remove uneeded JS 2013-01-22 12:15:46 +07:00
Lukas Reschke bd5ff29716 Merge branch 'master' into no-inline-js 2013-01-22 11:50:33 +07:00
Lukas Reschke d2383338de External JSON for the Apps 2013-01-21 22:18:42 +07:00
Lukas Reschke 30274ee33e Move to OC_App 2013-01-21 22:18:11 +07:00
Lukas Reschke 3ed7d5d521 Move isadmin to external file 2013-01-21 21:25:38 +07:00
Frank Karlitschek a27f92a17a we are getting closer. updating is not working yet. 2013-01-21 20:40:23 +07:00
Jenkins for ownCloud aede26d996 [tx-robot] updated from transifex 2013-01-21 00:05:34 +07:00
Jenkins for ownCloud ebc0c4b85b [tx-robot] updated from transifex 2013-01-20 00:06:40 +07:00
Thomas Mueller afb5de955e Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
 2013-01-18 23:22:34 +07:00
Jenkins for ownCloud 824fcf6624 [tx-robot] updated from transifex 2013-01-18 00:04:36 +07:00
Bart Visscher a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +07:00