Jan-Christoph Borchardt
|
683e125042
|
Merge branch 'sharing'
|
2011-08-17 13:48:36 +02:00 |
|
Frank Karlitschek
|
cb9fc6d901
|
make the help section working and pretty. knowledge base entries are fetched via OCS from a different server. cool stuff
|
2011-08-17 00:24:50 +02:00 |
|
Michael Gapczynski
|
e4c9871299
|
This should actually make the 'Shared' directory automatically everytime
|
2011-08-15 20:45:07 -04:00 |
|
Michael Gapczynski
|
5fbed936bf
|
Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory
|
2011-08-15 20:33:02 -04:00 |
|
Michael Gapczynski
|
1ec75330ec
|
Merge branch 'master' into sharing
|
2011-08-15 17:49:36 -04:00 |
|
Robin Appelman
|
13cbd7f578
|
some filesystem fixes
|
2011-08-15 22:55:14 +02:00 |
|
Robin Appelman
|
6173c0fbc2
|
a bit of refactoring for oc_filesystem and implement user quota
|
2011-08-15 21:09:13 +02:00 |
|
Jan-Christoph Borchardt
|
2cb231d0a4
|
resolved merge conflict
|
2011-08-14 19:31:38 +02:00 |
|
Jan-Christoph Borchardt
|
9648be97fb
|
better error messages for installation, still need to be inline
|
2011-08-13 05:37:12 +02:00 |
|
Jan-Christoph Borchardt
|
4a5ee765cf
|
merged admin, help and settings to settings
|
2011-08-13 05:13:34 +02:00 |
|
Michael Gapczynski
|
122018889a
|
Merge branch 'master' into sharing
Conflicts:
files/css/files.css
|
2011-08-12 21:00:41 -04:00 |
|
Michael Gapczynski
|
67156f87e3
|
Add missing parameter to usersInGroup()
|
2011-08-12 20:53:36 -04:00 |
|
Michael Gapczynski
|
ffe9da91af
|
Add missing parameter to usersInGroup()
|
2011-08-12 20:51:01 -04:00 |
|
Frank Karlitschek
|
c2a5b49834
|
better error reporting during installation
|
2011-08-12 19:22:29 +02:00 |
|
Jan-Christoph Borchardt
|
0b4ed25776
|
fixed downloading of files with spaces in name for Firefox
|
2011-08-12 12:03:59 +02:00 |
|
Jan-Christoph Borchardt
|
6c4d075bd6
|
added jquery-tipsy for nice title tooltips
|
2011-08-12 11:26:13 +02:00 |
|
Michael Gapczynski
|
4830555cce
|
Merge branch 'master' into sharing
Conflicts:
.gitignore
|
2011-08-11 17:42:37 -04:00 |
|
Jan-Christoph Borchardt
|
99790d6805
|
lots of image changes, use svg EVERYWHERE POSSIBLE
|
2011-08-11 19:00:32 +02:00 |
|
Frank Karlitschek
|
aa582ec43a
|
more work on encryption
|
2011-08-11 17:49:36 +02:00 |
|
Frank Karlitschek
|
d75faac09e
|
Merge branch 'master' of git.kde.org:owncloud
|
2011-08-11 16:33:53 +02:00 |
|
Frank Karlitschek
|
5b9f6b4001
|
hide the files admin page as long as we don have settings on the page
|
2011-08-11 16:24:53 +02:00 |
|
Robin Appelman
|
50c1553c38
|
automaticaly login after setup
|
2011-08-11 16:22:25 +02:00 |
|
Robin Appelman
|
bc5bf18eed
|
bit of work on app management
|
2011-08-11 15:11:06 +02:00 |
|
Jan-Christoph Borchardt
|
b4e89871dd
|
merged master into sharing
|
2011-08-11 13:29:22 +02:00 |
|
Robin Appelman
|
bfd72501a1
|
add OC_Group::usersInGroup() to get a list of all users in a group
|
2011-08-11 10:12:17 +02:00 |
|
Jan-Christoph Borchardt
|
05f3910718
|
moved search box directly to template
|
2011-08-10 22:56:55 +02:00 |
|
Robin Appelman
|
f03874ac49
|
work on user management
|
2011-08-10 22:38:28 +02:00 |
|
Michael Gapczynski
|
e1bde1a78e
|
Merge branch 'master' into sharing
Conflicts:
files/templates/index.php
|
2011-08-10 13:40:47 -04:00 |
|
Frank Karlitschek
|
613ab41eb3
|
more work on the encryption library
|
2011-08-10 17:24:38 +02:00 |
|
Robin Appelman
|
1f1498ceca
|
remove Log completely
|
2011-08-10 14:03:54 +02:00 |
|
Robin Appelman
|
cdf91b6b3e
|
work in new app management
|
2011-08-10 14:03:54 +02:00 |
|
Robin Appelman
|
9059b55979
|
make more strings translatable
|
2011-08-10 14:03:54 +02:00 |
|
Jakob Sack
|
c958a44e46
|
Copying globals to OC::*
|
2011-08-10 11:18:35 +02:00 |
|
Jakob Sack
|
7b653dbca6
|
use sprintf for translations
|
2011-08-10 11:08:30 +02:00 |
|
Michael Gapczynski
|
ec6aed8475
|
Merge branch 'master' into sharing
|
2011-08-09 10:42:50 -04:00 |
|
Serge Martin
|
97462b018d
|
Merge MySQL and PostgreSQL input fields
|
2011-08-09 11:32:22 +02:00 |
|
Robin Appelman
|
7b38e5d7c7
|
apps can now add their own forms to the Personal page
|
2011-08-08 23:46:52 +02:00 |
|
Jakob Sack
|
962907ee6f
|
Merge branch 'master' of git://anongit.kde.org/owncloud
Conflicts:
lib/template.php
|
2011-08-08 23:16:30 +02:00 |
|
Jakob Sack
|
4b967a9414
|
Minor improvements
|
2011-08-08 23:14:47 +02:00 |
|
Robin Appelman
|
d1d47eb5eb
|
do proper styling for settings pages
|
2011-08-08 22:38:42 +02:00 |
|
Robin Appelman
|
e6f6d3dabc
|
dont use a different navigation page for settings stuff
|
2011-08-08 21:43:31 +02:00 |
|
Bartek Przybylski
|
8bd82b96f3
|
checking for apache server in setup
|
2011-08-08 21:41:20 +02:00 |
|
Michael Gapczynski
|
1aa89b7cbb
|
Merge branch 'master' into sharing
Conflicts:
files/css/files.css
lib/base.php
|
2011-08-07 15:56:26 -04:00 |
|
Serge Martin
|
3e8ae8636c
|
Add postgresql support
REVIEW: 102101
|
2011-08-07 21:06:53 +02:00 |
|
Serge Martin
|
acf7916e71
|
user is a reserved word in postgresql
|
2011-08-07 19:02:41 +02:00 |
|
Frank Karlitschek
|
a0b7b85c56
|
remove debug
|
2011-08-07 18:00:35 +02:00 |
|
Frank Karlitschek
|
58c2d29f8c
|
report the right webserver user to simplify setup and debug
|
2011-08-07 17:58:56 +02:00 |
|
Frank Karlitschek
|
b2702c4406
|
fix include path
|
2011-08-07 17:39:38 +02:00 |
|
Frank Karlitschek
|
51caa624bb
|
first step to file encription
|
2011-08-07 17:32:48 +02:00 |
|
Frank Karlitschek
|
1dc3cb67fa
|
more improved error reporting
|
2011-08-06 23:31:38 +02:00 |
|