Robin Appelman
|
c4a793913c
|
Merge branch 'master' into filesystem
|
2012-10-28 10:28:25 +01:00 |
Lukas Reschke
|
2d5edead77
|
Revert "Fix a typo"
This reverts commit a306e4b8a0.
|
2012-10-28 10:21:06 +01:00 |
|
Lukas Reschke
|
a306e4b8a0
|
Fix a typo
|
2012-10-28 10:19:31 +01:00 |
Jenkins for ownCloud
|
1a08ef6a06
|
[tx-robot] updated from transifex
|
2012-10-28 00:02:29 +02:00 |
Michael Gapczynski
|
fefc4e1707
|
Load all apps in core share ajax file for apps to register their share backends
|
2012-10-27 17:25:10 -04:00 |
|
Thomas Müller
|
6f5d0ec9a9
|
don't enable user_external
|
2012-10-27 19:44:35 +02:00 |
Arthur Schiwon
|
58828d205f
|
LDAP: usersInGroup now also does LDAP serverside search.
|
2012-10-27 19:43:07 +02:00 |
|
Arthur Schiwon
|
3f85432df9
|
LDAP: make filter in readAttribute configurable
|
2012-10-27 19:43:07 +02:00 |
|
Thomas Müller
|
b390da3eba
|
don't enable apps twice
|
2012-10-27 19:37:10 +02:00 |
|
Robin Appelman
|
c964fe9f8d
|
merge master into filesystem
|
2012-10-27 18:11:52 +02:00 |
|
Robin Appelman
|
79d0ac21cc
|
delete child entries when a folder gets removed from cache
|
2012-10-27 18:08:00 +02:00 |
|
Robin Appelman
|
56e9ce44c3
|
add a way to recalucale the size of a folder in the cache
|
2012-10-27 18:08:00 +02:00 |
Bart Visscher
|
2dc1b778b4
|
Include copy of Symfony routing component, and don't use composer
|
2012-10-27 18:08:00 +02:00 |
Björn Schießle
|
0d3f68cc7a
|
fix function documentation
|
2012-10-27 18:08:00 +02:00 |
|
Björn Schießle
|
72aebe3aa3
|
fix broken paths in versions app
|
2012-10-27 18:08:00 +02:00 |
|
Björn Schießle
|
7891add286
|
don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning
|
2012-10-27 18:06:14 +02:00 |
|
Arthur Schiwon
|
1b2279c935
|
LDAP: getGroups to use paged searches
|
2012-10-27 17:46:01 +02:00 |
|
Arthur Schiwon
|
5b3c9518dc
|
LDAP: improve slicing
|
2012-10-27 17:46:01 +02:00 |
|
Arthur Schiwon
|
33aa630af3
|
LDAP: add error handling for failed searches
|
2012-10-27 17:46:01 +02:00 |
|
Arthur Schiwon
|
a053da58ce
|
LDAP: be careful which limit is send to possible paged LDAP search
|
2012-10-27 17:46:01 +02:00 |
|
Arthur Schiwon
|
977c4d1844
|
LDAP: use the correct attribute in filter
|
2012-10-27 17:46:01 +02:00 |
|
Arthur Schiwon
|
246221a677
|
LDAP: fix again proper check if groups are enabled
|
2012-10-27 17:46:01 +02:00 |
|
Arthur Schiwon
|
b942c1253e
|
remove TODO comment, it's done
|
2012-10-27 17:46:01 +02:00 |
|
Bart Visscher
|
fecfeac55d
|
Fix introduced style errors
|
2012-10-27 17:45:15 +02:00 |
|
Bart Visscher
|
d6953fa5ed
|
Remove wrongly committed files
|
2012-10-27 17:45:15 +02:00 |
|
Björn Schießle
|
f151376ad5
|
remove remaining line from merge conflict
|
2012-10-27 17:06:13 +02:00 |
|
Bart Visscher
|
894d44e796
|
Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'
Conflicts:
lib/base.php
|
2012-10-27 16:33:10 +02:00 |
|
Bart Visscher
|
c1c76539cc
|
Include copy of Symfony routing component, and don't use composer
|
2012-10-27 16:24:24 +02:00 |
|
Björn Schießle
|
8a3eda16f2
|
fix function documentation
|
2012-10-27 15:53:10 +02:00 |
|
Björn Schießle
|
a93660d37a
|
fix broken paths in versions app
|
2012-10-27 15:52:48 +02:00 |
|
Björn Schießle
|
c1a0e809bf
|
don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning
|
2012-10-27 15:50:17 +02:00 |
|
Robin Appelman
|
8973124574
|
Merge branch 'master' into filesystem
|
2012-10-27 15:31:27 +02:00 |
|
Bart Visscher
|
939b51e46f
|
Fix download url generation
|
2012-10-27 15:10:21 +02:00 |
|
Robin Appelman
|
38371d1275
|
Merge branch 'master' into filesystem
|
2012-10-27 14:28:24 +02:00 |
|
Robin Appelman
|
0fb707d2c9
|
some more porting of the sharing
|
2012-10-27 14:25:15 +02:00 |
|
Thomas Müller
|
0c40a061e4
|
fix paths in preeseed-config.php
|
2012-10-27 12:59:28 +02:00 |
|
Bart Visscher
|
9317039e0c
|
Add composer command for now, see
http://getcomposer.org/doc/00-intro.md#installation-nix
for local install
|
2012-10-27 12:27:54 +02:00 |
|
Robin Appelman
|
86be7e8872
|
remove last uses of depricated OC_Filesystem
|
2012-10-27 12:23:13 +02:00 |
|
Arthur Schiwon
|
605281da9b
|
LDAP: let result processing in Access::search slice the array for not-paginated search. getUsers e.g. does not need to take care of it anymore. adjustments in group_ldap to follow.
|
2012-10-27 12:19:08 +02:00 |
|
Arthur Schiwon
|
67cd268df9
|
LDAP: debug messaged
|
2012-10-27 12:19:08 +02:00 |
|
Arthur Schiwon
|
ee6fc22d4b
|
LDAP: sourced out paged search init into initPagedSearch method, making search slicker again
|
2012-10-27 12:19:08 +02:00 |
|
Robin Appelman
|
dea0d20a9a
|
fix delete and sort files
|
2012-10-27 12:18:01 +02:00 |
|
Robin Appelman
|
5bfff6c56e
|
use absolute paths when resolving mount points
|
2012-10-27 12:17:35 +02:00 |
|
Bart Visscher
|
0120f3fd62
|
Merge branch 'routing'
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
|
2012-10-27 11:58:02 +02:00 |
|
Bart Visscher
|
beaaf5425d
|
More info for composer.json
|
2012-10-27 11:56:51 +02:00 |
|
Thomas Müller
|
74665faec5
|
exeuting tests now on apps as well - the apps repo shall be cloned into the sub folder apps2
|
2012-10-27 11:43:24 +02:00 |
|
Bart Visscher
|
43e8293d9c
|
Change Symfony/Component/Routing from submodule to composer fetching
|
2012-10-27 11:32:16 +02:00 |
|
Robin Appelman
|
3437071cf1
|
remove old searchByMime
|
2012-10-27 10:40:27 +02:00 |
|
Robin Appelman
|
fcc92a9f43
|
add searchByMime to new cache api
|
2012-10-27 10:34:25 +02:00 |
Jakob Sack
|
22dcd3b6a6
|
fix bug
|
2012-10-27 10:23:36 +02:00 |