Lukas Reschke
|
b471177439
|
Merge pull request #1379 from owncloud/improved_appsmanagement
Improved appsmanagement
|
2013-01-31 08:30:55 -08:00 |
Jenkins for ownCloud
|
209d599ec5
|
[tx-robot] updated from transifex
|
2013-01-31 17:05:21 +01:00 |
Frank Karlitschek
|
f7d281af67
|
just return "true" for now
|
2013-01-31 12:24:10 +01:00 |
Björn Schießle
|
77765bd967
|
remove some left over comments
|
2013-01-31 12:17:23 +01:00 |
Björn Schießle
|
ab255e8bb6
|
add missing brackets
|
2013-01-31 12:12:39 +01:00 |
Björn Schießle
|
9a19c0af4b
|
search for display name and uid (with no display name) since it is possible that not all users have a seperate display name
|
2013-01-31 12:09:42 +01:00 |
Thomas Mueller
|
e8b423f666
|
style fixes
|
2013-01-31 10:30:13 +01:00 |
Thomas Mueller
|
665bb41c1f
|
style fixes
|
2013-01-31 10:27:02 +01:00 |
Frank Karlitschek
|
5112dac102
|
remove spaces
|
2013-01-31 10:00:42 +01:00 |
Robin Appelman
|
6043789394
|
Bumb version number for displayname db upgrade
|
2013-01-30 19:37:02 +01:00 |
Robin Appelman
|
207aa22d12
|
merge master into filesystem
|
2013-01-30 19:24:24 +01:00 |
Robin Appelman
|
af3b0e30ed
|
Cache: don't insert duplicated during upgrade
|
2013-01-30 19:19:19 +01: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 +01:00 |
irgsmirx
|
0bce22966c
|
Update lib/base.php
Correction of typo "locate" -> "locale".
|
2013-01-30 14:27:08 +01:00 |
Frank Karlitschek
|
389c4e8415
|
mark recommended apps. server part not yet fully implemented
|
2013-01-30 13:39:53 +01:00 |
root
|
3fa4b3abff
|
apps updater is now working
|
2013-01-30 12:08:14 +01:00 |
Jörn Friedrich Dreyer
|
a6040d0cc7
|
Merge pull request #1308 from TheSFReader/master
Changed the linkTo function (from Helper class) to get rid of an unnecessary (and potentially non conform) leading '&' character when adding arguments
|
2013-01-30 02:37:11 -08:00 |
Jenkins for ownCloud
|
68266e70f2
|
[tx-robot] updated from transifex
|
2013-01-30 00:25:41 +01:00 |
Lukas Reschke
|
250c565d2b
|
Merge pull request #1360 from owncloud/display_name
introduction of display names
|
2013-01-29 14:05:54 -08: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 +01:00 |
Björn Schießle
|
007bddceba
|
version dump to trigger db update
|
2013-01-29 21:04:28 +01:00 |
Björn Schießle
|
ebc3d1b2d7
|
remove dubug value
|
2013-01-29 21:01:59 +01:00 |
Arthur Schiwon
|
79c309da83
|
Typo
|
2013-01-29 20:42:21 +01:00 |
Arthur Schiwon
|
59bb9931df
|
Adjust user interface to additions around displayName Handling
|
2013-01-29 20:09:41 +01:00 |
Michael Gapczynski
|
ca4c006d5a
|
Make zip downloads use actual folder names, fix spelling mistakes
|
2013-01-28 23:51:35 -05:00 |
Jenkins for ownCloud
|
8c4931a645
|
[tx-robot] updated from transifex
|
2013-01-29 00:06:20 +01:00 |
Robin Appelman
|
74f6f85628
|
merge master into filesystem
|
2013-01-28 19:37:58 +01:00 |
Robin Appelman
|
06c1c35ac9
|
Fix phpdoc
|
2013-01-28 19:08:30 +01:00 |
Björn Schießle
|
590c4aa710
|
search display name instead of uid; fix key/value order for array access
|
2013-01-28 15:58:40 +01:00 |
Björn Schießle
|
c00b66fe5b
|
implement DisplayNamesInGroup for database back-end
|
2013-01-28 15:47:57 +01:00 |
Robin Appelman
|
232cc3211b
|
add oc:// streamwrapper to provide access to ownCloud's virtual filesystem
|
2013-01-28 15:35:30 +01:00 |
Robin Appelman
|
c9c919da57
|
Move streamwrappers to seperate files and put them in a namespace
|
2013-01-28 15:34:15 +01:00 |
Björn Schießle
|
e6cc0cd08a
|
implement display names for the database back-end
|
2013-01-28 15:07:31 +01:00 |
Lukas Reschke
|
99ec26578a
|
Merge pull request #1313 from owncloud/updater-CSP
Make update page with CSP compatible
|
2013-01-28 05:43:47 -08:00 |
Björn Schießle
|
70c3ab3c53
|
update the display name for the database back-end
|
2013-01-28 14:23:15 +01:00 |
Björn Schießle
|
e0f2ed2757
|
interface and API to change display names
|
2013-01-28 14:09:11 +01:00 |
Björn Schießle
|
022a7b13b8
|
prepare user table to show and edit display names
|
2013-01-28 13:12:44 +01:00 |
Björn Schießle
|
996b5cf368
|
change order, key -> uid and value -> display name, this way it is also possible to have non-unique display names
|
2013-01-28 13:10:54 +01:00 |
Thomas Müller
|
857b15db37
|
Merge pull request #1318 from j-ed/master
added parameter mail_smtpauthtype to set SMTP authentication type.
|
2013-01-28 01:42:46 -08:00 |
Thomas Mueller
|
1d44a99ebb
|
Merge branch 'master' into updater-CSP
Conflicts:
core/templates/update.php
|
2013-01-28 09:57:24 +01:00 |
Thomas Müller
|
31d83fddc4
|
Merge pull request #1321 from owncloud/csp-fixes
Files: CSP fixes
|
2013-01-28 00:29:46 -08:00 |
Robin Appelman
|
bca5ce724e
|
Merge branch 'master' into filesystem
|
2013-01-28 02:35:51 +01:00 |
Robin Appelman
|
3e59a87153
|
Filesystem: use the updated Mount::findById in getPath to ensure we get the correct path if the storage is also mounted outside the view
|
2013-01-28 01:02:04 +01:00 |
Robin Appelman
|
577e3b11d7
|
Filesystem: return all matching mounts in Mount::findById
|
2013-01-28 00:59:43 +01:00 |
Robin Appelman
|
4cae141673
|
Filesystem: also add getPath to \OC\Filesystem
|
2013-01-27 00:18:15 +01:00 |
Robin Appelman
|
17bcea1585
|
Filesystem: add View->getPath to the cache api
|
2013-01-27 00:13:50 +01:00 |
Robin Appelman
|
9e2a066c7b
|
Cache: add function to get storage id and internal path of a file by id
|
2013-01-27 00:13:50 +01:00 |
Robin Appelman
|
69f11151e9
|
Filesystem: add Mount::findById
|
2013-01-27 00:13:49 +01:00 |
Jenkins for ownCloud
|
00a28062e1
|
[tx-robot] updated from transifex
|
2013-01-27 00:06:21 +01:00 |
TheSFReader
|
9c7a18044d
|
Merge remote-tracking branch 'refs/remotes/upstream/master'
|
2013-01-26 23:19:40 +01:00 |