Georg Ehrke
|
ad66bb9c84
|
Merge branch 'calendar_dropimport'
|
2012-05-19 18:58:24 +02:00 |
Frank Karlitschek
|
c0db603d29
|
this is 5 pre alpha now
|
2012-05-19 18:21:33 +02:00 |
Michael Gapczynski
|
5a48ade933
|
Make sure sharing and versions dropdowns come down in the same location for all files
|
2012-05-19 11:24:23 -04:00 |
|
Georg Ehrke
|
d4072c82dd
|
some fixes for contacts, gallery and openid
|
2012-05-19 15:22:21 +02:00 |
|
Georg Ehrke
|
07fa8da278
|
fix for calendar
|
2012-05-19 15:05:58 +02:00 |
|
Frank Karlitschek
|
7e49a33d64
|
getStorage belongs to files not to apps.
|
2012-05-19 10:44:08 +02:00 |
|
Frank Karlitschek
|
08f7d4c552
|
document the public classes a bit more
|
2012-05-19 10:36:57 +02:00 |
|
Michael Gapczynski
|
35bd601215
|
Fix check for when to store a new version of a file
|
2012-05-18 22:27:43 -04:00 |
|
Michael Gapczynski
|
f750da1802
|
Fix revert link on history page of file versions
|
2012-05-18 22:07:48 -04:00 |
|
Michael Gapczynski
|
89f5701d1a
|
Fix versioning of shared files
|
2012-05-18 22:07:48 -04:00 |
Robin Appelman
|
a2cc772aa5
|
dont run update scripts for apps that arent enabled
|
2012-05-19 02:00:46 +02:00 |
|
Robin Appelman
|
b096fd9ed8
|
log upgrades
|
2012-05-19 01:55:20 +02:00 |
|
Robin Appelman
|
df64b9b0e9
|
strict standards fixes for sqlite3
|
2012-05-19 01:39:41 +02:00 |
|
Michael Gapczynski
|
90cbc32c77
|
Fix redirect after login, prevent open redirects
|
2012-05-18 16:56:48 -04:00 |
|
Frank Karlitschek
|
e03b5ff665
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-05-18 21:16:03 +02:00 |
|
Frank Karlitschek
|
fdbe0c9734
|
don´t claim that already downloaded 3rd party apps are internal apps
|
2012-05-18 21:14:07 +02:00 |
|
Frank Karlitschek
|
0df376d472
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-05-18 18:25:31 +02:00 |
|
Frank Karlitschek
|
16224e5e8b
|
"fopen(" interferes with our own classes.
remove it for now and let´s fix this later
|
2012-05-18 18:22:37 +02:00 |
Arthur Schiwon
|
c1bb8139a0
|
LDAP: we're 0.2 now
|
2012-05-18 18:00:30 +02:00 |
|
Arthur Schiwon
|
bae954a797
|
LDAP: only check once for name conflicts on update. Set a value on install as well
|
2012-05-18 18:00:30 +02:00 |
Thomas Tanghus
|
7922338050
|
Contacts: Added MS opacity mumbo-jumbo that I can't test myself to file form fields.
|
2012-05-18 17:39:19 +02:00 |
|
Arthur Schiwon
|
e606213fa0
|
make upload work with IE again
|
2012-05-18 17:07:00 +02:00 |
|
Arthur Schiwon
|
0c7efc234b
|
LDAP: update meta info
|
2012-05-18 17:07:00 +02:00 |
|
Michael Gapczynski
|
ea7456a06a
|
Forgot to actually call remove on the history dropdown
|
2012-05-18 10:53:58 -04:00 |
|
Michael Gapczynski
|
fcb4d2aaee
|
Remove the history dropdown before creating a new one
|
2012-05-18 10:42:49 -04:00 |
|
Michael Gapczynski
|
122d1efecf
|
Don't show the select form in the history dropdown if a file has no other versions
|
2012-05-18 10:39:43 -04:00 |
Michiel de Jong
|
fc536c3491
|
add htmlentities() call into login form
|
2012-05-18 16:12:49 +02:00 |
|
Frank Karlitschek
|
9e73524168
|
mark the apps as part of the shipped package and increase the requirement to ownCloud 4
|
2012-05-18 16:06:57 +02:00 |
|
Frank Karlitschek
|
2d3c709163
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-05-18 15:56:15 +02:00 |
|
Frank Karlitschek
|
db77dc91bc
|
only try to install apps that are compatible with oC4
|
2012-05-18 15:54:36 +02:00 |
|
Frank Karlitschek
|
2e9115efe0
|
increase to RC2
|
2012-05-18 15:54:17 +02:00 |
|
Michiel de Jong
|
a6ff909911
|
this code looks wrong to me but i'm putting it back while we find out what the right code should look like
|
2012-05-18 15:39:28 +02:00 |
|
Michiel de Jong
|
1a874b4c56
|
make redirect safe by restricting it to current host
|
2012-05-18 15:32:41 +02:00 |
|
Michiel de Jong
|
9b5e8a2c63
|
fix redirect to desired page after login
|
2012-05-18 15:11:01 +02:00 |
|
Arthur Schiwon
|
ea33b4aaa1
|
LDAP: don't make us of global constants (completing, was removed with latest additions to update.php)
|
2012-05-18 12:55:38 +02:00 |
|
Arthur Schiwon
|
253f101b39
|
LDAP: check wether applying naming rule would end up in conflicts on update, if so don't do it
|
2012-05-18 12:55:37 +02:00 |
|
Georg Ehrke
|
73a72054a3
|
fix call of all versions page
|
2012-05-18 12:00:35 +02:00 |
|
Michael Gapczynski
|
b7aee58ef9
|
Hooks aren't working across different users' filesystems, so update the mtime of the Shared folder for all shared item events
|
2012-05-17 21:26:55 -04:00 |
|
Robin Appelman
|
48505c5626
|
improve tar archive backend
|
2012-05-18 01:54:59 +02:00 |
|
Michael Gapczynski
|
5b42325b01
|
History dropdown clean-up
|
2012-05-17 18:57:52 -04:00 |
Tom Needham
|
74d49920f2
|
Close history dropdown on success. Avoids confusion.
|
2012-05-17 21:22:48 +00:00 |
|
Tom Needham
|
0aac70aaf1
|
Revert google webfont removal. Sadly this causes havoc with the editor!
|
2012-05-17 20:23:43 +00:00 |
|
Georg Ehrke
|
38b93653a1
|
Merge branch 'master' into calendar_dropimport
|
2012-05-17 22:17:06 +02:00 |
|
Michael Gapczynski
|
fbe0d0d4fd
|
Fix private links inside folders
|
2012-05-17 16:12:33 -04:00 |
|
Georg Ehrke
|
b35c6b57a9
|
allow loading of css files even if a user isn't logged in
|
2012-05-17 21:56:33 +02:00 |
|
Georg Ehrke
|
6146b6a131
|
fix paths to images and set height for calendar management dialog
|
2012-05-17 21:51:38 +02:00 |
|
Michael Gapczynski
|
57d41bb1f8
|
Merge branch 'merge-requests/115'
|
2012-05-17 15:39:39 -04:00 |
|
Michael Gapczynski
|
cbfbbe672c
|
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
Conflicts:
apps/files/templates/index.php
|
2012-05-17 15:38:28 -04:00 |
|
Michiel de Jong
|
2cc0515161
|
no use for double quotes here
|
2012-05-17 21:03:06 +02:00 |
|
Michiel de Jong
|
f998ed331a
|
removing dead code
|
2012-05-17 21:01:42 +02:00 |